diff options
| author | Nay <dnpd.dd@gmail.com> | 2011-11-26 03:19:37 +0000 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2011-11-26 03:19:37 +0000 |
| commit | 846870bf6c47fbbdefef39c35ff11159b850082b (patch) | |
| tree | d2a850d832e9242fb5ca1cf22df29f8cab851406 /src/server/game/Conditions/DisableMgr.cpp | |
| parent | 31533a342a56b1db22b50fe9f6c4c24c380cd507 (diff) | |
| parent | c105be95a5b9f42d0d85fc2d3c5563a928321eb4 (diff) | |
Merge branch 'master' into 4.x
Conflicts:
src/server/shared/Database/Implementation/CharacterDatabase.cpp
Diffstat (limited to 'src/server/game/Conditions/DisableMgr.cpp')
| -rwxr-xr-x | src/server/game/Conditions/DisableMgr.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Conditions/DisableMgr.cpp b/src/server/game/Conditions/DisableMgr.cpp index 982c0f16ffa..07febf889d0 100755 --- a/src/server/game/Conditions/DisableMgr.cpp +++ b/src/server/game/Conditions/DisableMgr.cpp @@ -280,7 +280,6 @@ bool IsDisabledFor(DisableType type, uint32 entry, Unit const* unit, uint8 flags uint8 spellFlags = itr->second.flags; if (unit) { - if ((spellFlags & SPELL_DISABLE_PLAYER && unit->GetTypeId() == TYPEID_PLAYER) || (unit->GetTypeId() == TYPEID_UNIT && ((unit->ToCreature()->isPet() && spellFlags & SPELL_DISABLE_PET) || spellFlags & SPELL_DISABLE_CREATURE))) { @@ -311,6 +310,7 @@ bool IsDisabledFor(DisableType type, uint32 entry, Unit const* unit, uint8 flags } else if (spellFlags & SPELL_DISABLE_DEPRECATED_SPELL) // call not from spellcast return true; + break; } case DISABLE_TYPE_MAP: |