Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-18 00:18:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Browse Source 
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Achievements/AchievementMgr.h
	src/server/game/Globals/ObjectMgr.cpp
This commit is contained in:
Vincent-Michael
2014-09-20 22:39:37 +02:00
parent 8e288dd673 72d08a146f
commit f767aef12e
52 changed files with 3136 additions and 959 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/game/Maps/MapManager.cpp
View File

@@ -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);
}