aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Conditions/DisableMgr.cpp
diff options
context:
space:
mode:
authorShauren <none@none>2010-07-26 22:25:03 +0200
committerShauren <none@none>2010-07-26 22:25:03 +0200
commit4fb256254c4abb5d65fbaca7fcdf5cf33322f00c (patch)
tree5fc15b329b9d20f1d299a32a271bec9c02c9dd66 /src/server/game/Conditions/DisableMgr.cpp
parent31820f03407a579c58beda65a83199f052842385 (diff)
Fixed bug in Player::Satisfy that allowed to sometimes bypass instance requirements
Fixed DisableMgr incorrectly blocking entry into maps when only one mode was disabled --HG-- branch : trunk
Diffstat (limited to 'src/server/game/Conditions/DisableMgr.cpp')
-rw-r--r--src/server/game/Conditions/DisableMgr.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/server/game/Conditions/DisableMgr.cpp b/src/server/game/Conditions/DisableMgr.cpp
index 803d607b7f8..1900626dff5 100644
--- a/src/server/game/Conditions/DisableMgr.cpp
+++ b/src/server/game/Conditions/DisableMgr.cpp
@@ -218,8 +218,6 @@ bool DisableMgr::IsDisabledFor(DisableType type, uint32 entry, Unit const* pUnit
return true;
}
case DISABLE_TYPE_MAP:
- if (!pUnit)
- return true;
if (Player const* pPlayer = pUnit->ToPlayer())
{
MapEntry const* mapEntry = sMapStore.LookupEntry(entry);