Misc: some corrections after recent merges

Port From (https://github.com/TrinityCore/TrinityCore/commit/cadbf42ea4489933f28caf356f8c8d09ca243083)
2021-12-24 21:38:37 -05:00
parent 409be0be01
commit 73fa489610
6 changed files with 24 additions and 14 deletions
@@ -1661,8 +1661,7 @@ namespace Game.Entities
            SetUnitMovementFlags(GetUnitMovementFlags() & MovementFlag.MaskHasPlayerStatusOpcode);
            m_movementInfo.ResetJump();
            DisableSpline();
-            if (!IsInFlight())
-                GetMotionMaster().Clear();
+            GetMotionMaster().Remove(MovementGeneratorType.Effect);

            Transport transport = GetTransport();
            if (transport)