From 1329b6b471e419285fb6155c407e76e4223728ec Mon Sep 17 00:00:00 2001 From: Dresmyr Date: Sat, 1 Feb 2020 09:03:48 -0500 Subject: [PATCH] fix(Core/Hook): Make OnPlayerLeaveMap actually trigger (#2628) OnPlayerLeaveMap was previously inside the if(remove) block which only is called when the player is logging out, this moves it outside that block but still has it trigger in the same order, thus allowing OnPlayerLeaveMap scripts to fire properly (needed for AutoBalanceFix) --- 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 71b4bdc78..3ff92bba9 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -876,9 +876,9 @@ void Map::RemovePlayerFromMap(Player* player, bool remove) else ASSERT(remove); //maybe deleted in logoutplayer when player is not in a map + sScriptMgr->OnPlayerLeaveMap(this, player); if (remove) { - sScriptMgr->OnPlayerLeaveMap(this, player); DeleteFromWorld(player); } }