Core/Movement: Fixed player movement being blocked if teleported within the same map while not being in control of their character

Author: Shauren

src/server/game/Entities/Player/Player.cpp

@@ -1570,7 +1570,7 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati
     // reset movement flags at teleport, because player will continue move with these flags after teleport
     SetUnitMovementFlags(GetUnitMovementFlags() & MOVEMENTFLAG_MASK_HAS_PLAYER_STATUS_OPCODE);
     DisableSpline();
-    GetMotionMaster()->Remove(EFFECT_MOTION_TYPE);
+    GetMotionMaster()->InterruptOnTeleport();
 
     if (Transport* transport = GetTransport())
     {
@@ -1622,10 +1622,13 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati
 
         // code for finish transfer called in WorldSession::HandleMovementOpcodes()
         // at client packet MSG_MOVE_TELEPORT_ACK
-        SetSemaphoreTeleportNear(true);
+        SetSemaphoreTeleportNear(IsMovedByClient());
         // near teleport, triggering send MSG_MOVE_TELEPORT_ACK from client at landing
         if (!GetSession()->PlayerLogout())
             SendTeleportPacket(m_teleport_dest, (options & TELE_TO_TRANSPORT_TELEPORT) != 0);
+
+        if (!IsBeingTeleportedNear()) // update position immediately if we will not be waiting for client ACK
+            UpdatePosition(m_teleport_dest, true);
     }
     else
     {

src/server/game/Entities/Unit/Unit.cpp

@@ -12821,14 +12821,15 @@ bool Unit::CanSwim() const
 
 void Unit::NearTeleportTo(Position const& pos, bool casting /*= false*/)
 {
-    DisableSpline();
-    if (GetTypeId() == TYPEID_PLAYER)
+    if (Player* player = ToPlayer())
     {
         WorldLocation target(GetMapId(), pos);
-        ToPlayer()->TeleportTo(target, TELE_TO_NOT_LEAVE_TRANSPORT | TELE_TO_NOT_LEAVE_COMBAT | (casting ? TELE_TO_SPELL : 0));
+        player->TeleportTo(target, TELE_TO_NOT_LEAVE_TRANSPORT | TELE_TO_NOT_LEAVE_COMBAT | (casting ? TELE_TO_SPELL : 0));
     }
     else
     {
+        DisableSpline();
+        GetMotionMaster()->InterruptOnTeleport();
         SendTeleportPacket(pos);
         UpdatePosition(pos, true);
         UpdateObjectVisibility();
@@ -12865,7 +12866,7 @@ void Unit::SendTeleportPacket(Position const& pos, bool teleportingTransport /*=
 
     WorldPacket moveUpdateTeleport(MSG_MOVE_TELEPORT, 38);
     moveUpdateTeleport << GetPackGUID();
-    Unit* broadcastSource = this;
+    Unit::BuildMovementPacket(pos, transportPos, teleportMovementInfo, &moveUpdateTeleport);
 
     if (IsMovedByClient())
     {
@@ -12876,13 +12877,11 @@ void Unit::SendTeleportPacket(Position const& pos, bool teleportingTransport /*=
         Unit::BuildMovementPacket(pos, transportPos, teleportMovementInfo, &moveTeleport);
         playerMover->SendDirectMessage(&moveTeleport);
 
-        broadcastSource = playerMover;
+        // Broadcast the packet to everyone except self.
+        SendMessageToSet(&moveUpdateTeleport, playerMover);
     }
-
-    Unit::BuildMovementPacket(pos, transportPos, teleportMovementInfo, &moveUpdateTeleport);
-
-    // Broadcast the packet to everyone except self.
-    broadcastSource->SendMessageToSet(&moveUpdateTeleport, false);
+    else
+        SendMessageToSet(&moveUpdateTeleport, true);
 }
 
 bool Unit::UpdatePosition(float x, float y, float z, float orientation, bool teleport)

src/server/game/Movement/MotionMaster.cpp

@@ -534,6 +534,13 @@ bool MotionMaster::StopOnDeath()
     return true;
 }
 
+void MotionMaster::InterruptOnTeleport()
+{
+    if (MovementGenerator* top = GetCurrentMovementGenerator())
+        if (!top->HasFlag(MOVEMENTGENERATOR_FLAG_DEACTIVATED | MOVEMENTGENERATOR_FLAG_FINALIZED))
+            top->Deactivate(_owner); // only deactivate top, don't remove it. non-resumable generators will clean up themselves on next update
+}
+
 void MotionMaster::MoveIdle()
 {
     Add(GetIdleMovementGenerator(), MOTION_SLOT_DEFAULT);

src/server/game/Movement/MotionMaster.h

@@ -148,6 +148,7 @@ class TC_GAME_API MotionMaster
         void PropagateSpeedChange();
         bool GetDestination(float &x, float &y, float &z);
         bool StopOnDeath();
+        void InterruptOnTeleport();
 
         void MoveIdle();
         void MoveTargetedHome();