From bb70286d18b7a46bf41c50bb4447fa7f3e8260ff Mon Sep 17 00:00:00 2001
From: Rochet2 <rochet2@post.com>
Date: Sun, 11 Mar 2018 17:54:48 +0200
Subject: [PATCH] Fix crash with dangling player pointer

For a more educated fix would need to get access to git history for why the hook was moved here.
Or alternatively, try research what would be the correct place for the hook.
---
 src/server/game/Maps/Map.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp
index 4e6a595a5..594914508 100644
--- a/src/server/game/Maps/Map.cpp
+++ b/src/server/game/Maps/Map.cpp
@@ -815,8 +815,8 @@ void Map::RemovePlayerFromMap(Player* player, bool remove)
 
     if (remove)
     {
-        DeleteFromWorld(player);
         sScriptMgr->OnPlayerLeaveMap(this, player);
+        DeleteFromWorld(player);
     }
 }