Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: src/server/game/AI/EventAI/CreatureEventAI.cpp src/server/game/AI/EventAI/CreatureEventAI.h src/server/game/Achievements/AchievementMgr.cpp
This commit is contained in:
commit
d5163d846f
40 files changed
+603
-93
No files matched your search
@@ -179,6 +179,7 @@ bool MapManager::CanPlayerEnter(uint32 mapid, Player* player, bool loginCheck)
|
||||
else // attempt to downscale
|
||||
mapDiff = GetDownscaledMapDifficultyData(entry->MapID, targetDifficulty);
|
||||
}
|
||||
// FIXME: mapDiff is never used
|
||||
|
||||
//Bypass checks for GMs
|
||||
if (player->isGameMaster())
|
||||
|
||||
Reference in new issue
Block a user