From 9907984aca15eeda7b2439d63a1431650f20668d Mon Sep 17 00:00:00 2001 From: Noudess Date: Tue, 26 Jan 2021 09:08:45 -0500 Subject: [PATCH] Use passed heading in GMMove and change FaceTarget not to turn if npc is boat. --- zone/mob.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/zone/mob.cpp b/zone/mob.cpp index 825ae2538..d2ed1e983 100644 --- a/zone/mob.cpp +++ b/zone/mob.cpp @@ -1734,6 +1734,7 @@ void Mob::GMMove(float x, float y, float z, float heading, bool SendUpdate) { m_Position.x = x; m_Position.y = y; m_Position.z = z; + SetHeading(heading); mMovementManager->SendCommandToClients(this, 0.0, 0.0, 0.0, 0.0, 0, ClientRangeAny); if (IsNPC()) { @@ -2820,6 +2821,11 @@ bool Mob::HateSummon() { } void Mob::FaceTarget(Mob* mob_to_face /*= 0*/) { + + if (IsBoat()) { + return; + } + Mob* faced_mob = mob_to_face; if(!faced_mob) { if(!GetTarget()) {