diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-09-20 22:39:37 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-09-20 22:39:37 +0200 |
| commit | f767aef12eaf2e55deed89590eb9e8a39b0d1653 (patch) | |
| tree | c8737ba6d3d7065daf61046ed9d424d7bfc7c5e0 /src/server/game/Maps/MapManager.cpp | |
| parent | 8e288dd6731ed608d8285f9f966783ee9b46eebf (diff) | |
| parent | 72d08a146f3ca8369f173b9293d564673155491a (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Achievements/AchievementMgr.h
src/server/game/Globals/ObjectMgr.cpp
Diffstat (limited to 'src/server/game/Maps/MapManager.cpp')
| -rw-r--r-- | src/server/game/Maps/MapManager.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/server/game/Maps/MapManager.cpp b/src/server/game/Maps/MapManager.cpp index ac35b94575c..9297e2a3d6a 100644 --- a/src/server/game/Maps/MapManager.cpp +++ b/src/server/game/Maps/MapManager.cpp @@ -36,6 +36,7 @@ #include "Player.h" #include "WorldSession.h" #include "Opcodes.h" +#include "AchievementMgr.h" MapManager::MapManager() { @@ -393,4 +394,5 @@ void MapManager::FreeInstanceId(uint32 instanceId) SetNextInstanceId(instanceId); _instanceIds[instanceId] = false; + sAchievementMgr->OnInstanceDestroyed(instanceId); } |