From 7b27b98599bf7f648ed0dfc329421b27bb2783c4 Mon Sep 17 00:00:00 2001 From: Tartalo Date: Fri, 9 Jul 2010 13:12:25 +0200 Subject: Remove double requirement check in AreaTrigger teleport --HG-- branch : trunk --- src/server/game/Server/Protocol/Handlers/MiscHandler.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src') 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)) -- cgit v1.2.3