Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: src/server/game/Battlegrounds/BattlegroundMgr.cpp src/server/game/Entities/Player/Player.cpp src/server/game/Handlers/QuestHandler.cpp src/server/game/Spells/SpellInfo.h src/server/game/World/World.cpp
This commit is contained in:
commit
f7aedaef33
56 files changed
+455
-117
No files matched your search
@@ -43,6 +43,9 @@ MapManager::MapManager()
|
||||
{
|
||||
i_gridCleanUpDelay = sWorld->getIntConfig(CONFIG_INTERVAL_GRIDCLEAN);
|
||||
i_timer.SetInterval(sWorld->getIntConfig(CONFIG_INTERVAL_MAPUPDATE));
|
||||
memset(i_GridStates, 0, sizeof(i_GridStates));
|
||||
i_GridStateErrorCount = 0;
|
||||
_nextInstanceId = 0;
|
||||
}
|
||||
|
||||
MapManager::~MapManager() { }
|
||||
|
||||
Reference in new issue
Block a user