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:
Vincent_Michael committed 2013-01-05 17:01:46 +01:00
commit d5163d846f
40 files changed
+603 -93

No files matched your search

+1
View File
@@ -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())