From d167890b3f1895cae41afe71cf537704888f5634 Mon Sep 17 00:00:00 2001 From: Barbz Date: Wed, 26 Dec 2018 01:42:27 +0100 Subject: [PATCH] CORE/Movement: Fix a potential crash with a player out of bounds. (#970) --- src/server/game/Handlers/MovementHandler.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/server/game/Handlers/MovementHandler.cpp b/src/server/game/Handlers/MovementHandler.cpp index 6d7083a08..f02db835a 100644 --- a/src/server/game/Handlers/MovementHandler.cpp +++ b/src/server/game/Handlers/MovementHandler.cpp @@ -488,10 +488,12 @@ void WorldSession::HandleMovementOpcodes(WorldPacket & recvData) else if (!plrMover->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_IS_OUT_OF_BOUNDS)) { WorldSafeLocsEntry const* grave = sObjectMgr->GetClosestGraveyard(plrMover->GetPositionX(), plrMover->GetPositionY(), plrMover->GetPositionZ(), plrMover->GetMapId(), plrMover->GetTeamId()); - - if ( grave) + + if (grave) + { plrMover->TeleportTo(grave->map_id, grave->x, grave->y, grave->z, plrMover->GetOrientation()); - plrMover->Relocate(grave->x, grave->y, grave->z, plrMover->GetOrientation()); + plrMover->Relocate(grave->x, grave->y, grave->z, plrMover->GetOrientation()); + } } plrMover->StopMovingOnCurrentPos(); // pussywizard: moving corpse can't release spirit