Prevent client update while on boat if boat turning (#1343)

Co-authored-by: Noudess <noudess@gmail.com>
EQEmu · May 10, 2021 · b335568 · b335568
1 parent 0758250
commit b335568
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 0 deletions.
diff --git a/zone/client_packet.cpp b/zone/client_packet.cpp
@@ -4474,6 +4474,8 @@ void Client::Handle_OP_ClientUpdate(const EQApplicationPacket *app) {
 			LogError("Can't find boat for client position offset.");
 		}
 		else {
+			if (boat->turning) return;
+
 			// Calculate angle from boat heading to EQ heading
 			double theta = std::fmod(((boat->GetHeading() * 360.0) / 512.0),360.0);
 			double thetar = (theta * M_PI) / 180.0;

diff --git a/zone/mob.cpp b/zone/mob.cpp
@@ -131,6 +131,7 @@ Mob::Mob(
 	AI_Init();
 	SetMoving(false);
 	moved            = false;
+	turning = false;
 	m_RewindLocation = glm::vec3();
 	m_RelativePosition = glm::vec4();
 

diff --git a/zone/mob.h b/zone/mob.h
@@ -1486,6 +1486,7 @@ class Mob : public Entity {
 	bool GetWasSpawnedInWater() const;
 
 	void SetSpawnedInWater(bool spawned_in_water);
+	bool turning;
 
 protected:
 

diff --git a/zone/mob_movement_manager.cpp b/zone/mob_movement_manager.cpp
@@ -63,6 +63,7 @@ class RotateToCommand : public IMovementCommand {
 
 		if (!m_started) {
 			m_started = true;
+			mob->turning = true;
 			mob->SetMoving(true);
 
 			if (dist > 15.0f && rotate_to_speed > 0.0 && rotate_to_speed <= 25.0) { //send basic rotation
@@ -84,6 +85,7 @@ class RotateToCommand : public IMovementCommand {
 			mob->SetHeading(to);
 			mob->SetMoving(false);
 			mob_movement_manager->SendCommandToClients(mob, 0.0, 0.0, 0.0, 0.0, 0, ClientRangeCloseMedium);
+			mob->turning = false;
 			return true;
 		}
 
@@ -1370,7 +1372,9 @@ void MobMovementManager::UpdatePathBoat(Mob *who, float x, float y, float z, Mob
 {
 	auto eiter = _impl->Entries.find(who);
 	auto &ent  = (*eiter);
+	float to = who->CalculateHeadingToTarget(x, y);
 
+	PushRotateTo(ent.second, who, to, mode);
 	PushSwimTo(ent.second, x, y, z, mode);
 	PushStopMoving(ent.second);
 }