aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTartalo <none@none>2010-07-09 13:12:25 +0200
committerTartalo <none@none>2010-07-09 13:12:25 +0200
commit7b27b98599bf7f648ed0dfc329421b27bb2783c4 (patch)
treed2c06c2cda0d8404150db8e4fd4263b9541d2db4
parentbf111e7d962ae1d824120acb9da6d47f03d92e27 (diff)
Remove double requirement check in AreaTrigger teleport
--HG-- branch : trunk
-rw-r--r--src/server/game/Server/Protocol/Handlers/MiscHandler.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp b/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp
index 3bc5e8d507f..06a2210d79f 100644
--- a/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp
@@ -931,8 +931,9 @@ void WorldSession::HandleAreaTriggerOpcode(WorldPacket & recv_data)
if (!at)
return;
- if (!GetPlayer()->Satisfy(objmgr.GetAccessRequirement(at->access_id), at->target_mapId, true))
- return;
+ // MapManager::CanPlayerEnter() calls players->Satisfy() so this is not needed here
+ // if (!GetPlayer()->Satisfy(objmgr.GetAccessRequirement(at->access_id), at->target_mapId, true))
+ // return;
// check if player can enter instance : instance not full, and raid instance not in encounter fight
if (!sMapMgr.CanPlayerEnter(at->target_mapId, GetPlayer(), false))