aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Conditions/DisableMgr.cpp
diff options
context:
space:
mode:
authorMachiavelli <machiavelli.trinity@gmail.com>2011-11-25 13:46:07 +0100
committerMachiavelli <machiavelli.trinity@gmail.com>2011-11-25 13:46:07 +0100
commitb4ac70f8cbcdb42e601778221dfa45c9ced117eb (patch)
treec55342737ae38716d6422c3d8911ca6a2f1fe26f /src/server/game/Conditions/DisableMgr.cpp
parentcf0d5e4ec87b00baf19f89146e8c4a028a9a9038 (diff)
parentd2b4f331128e10748ad31d3dbc83b36eba5904ca (diff)
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.x
Diffstat (limited to 'src/server/game/Conditions/DisableMgr.cpp')
-rwxr-xr-xsrc/server/game/Conditions/DisableMgr.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Conditions/DisableMgr.cpp b/src/server/game/Conditions/DisableMgr.cpp
index 32c73027cba..982c0f16ffa 100755
--- a/src/server/game/Conditions/DisableMgr.cpp
+++ b/src/server/game/Conditions/DisableMgr.cpp
@@ -284,7 +284,7 @@ bool IsDisabledFor(DisableType type, uint32 entry, Unit const* unit, uint8 flags
if ((spellFlags & SPELL_DISABLE_PLAYER && unit->GetTypeId() == TYPEID_PLAYER) ||
(unit->GetTypeId() == TYPEID_UNIT && ((unit->ToCreature()->isPet() && spellFlags & SPELL_DISABLE_PET) || spellFlags & SPELL_DISABLE_CREATURE)))
{
- if (flags & SPELL_DISABLE_MAP)
+ if (spellFlags & SPELL_DISABLE_MAP)
{
std::set<uint32> const& mapIds = itr->second.params[0];
if (mapIds.find(unit->GetMapId()) != mapIds.end())