Core/Misc: Another batch of fixes for issues found by static analysis

1 files changed, 2 insertions, 4 deletions

diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp
index b28873d2e4d..d59f475f300 100644
--- a/src/server/game/Maps/Map.cpp
+++ b/src/server/game/Maps/Map.cpp
@@ -672,6 +672,8 @@ void Map::ProcessRelocationNotifies(const uint32 diff)
 
 void Map::RemovePlayerFromMap(Player* player, bool remove)
 {
+    sScriptMgr->OnPlayerLeaveMap(this, player);
+
     player->RemoveFromWorld();
     SendRemoveTransports(player);
 
@@ -682,11 +684,7 @@ void Map::RemovePlayerFromMap(Player* player, bool remove)
         ASSERT(remove); //maybe deleted in logoutplayer when player is not in a map
 
     if (remove)
-    {
         DeleteFromWorld(player);
-
-        sScriptMgr->OnPlayerLeaveMap(this, player);
-    }
 }
 
 template<class T>