diff options
| author | Rat <gmstreetrat@gmail.com> | 2011-11-23 20:23:26 +0100 |
|---|---|---|
| committer | Rat <gmstreetrat@gmail.com> | 2011-11-23 20:23:26 +0100 |
| commit | 5d39e09d8909a9220a5fc156185c5d5473321d9f (patch) | |
| tree | 950dc8db09aee5ac260840e63c7c446eb7782524 /src/server/game/Conditions/DisableMgr.cpp | |
| parent | 47d0a7f3afbb25d26dec8721801b13d4392aaf1d (diff) | |
| parent | afb2289d02fa3d7357b36aaf9065ddc579d00fc9 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore
Diffstat (limited to 'src/server/game/Conditions/DisableMgr.cpp')
| -rwxr-xr-x | src/server/game/Conditions/DisableMgr.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/server/game/Conditions/DisableMgr.cpp b/src/server/game/Conditions/DisableMgr.cpp index 103781cc49c..32c73027cba 100755 --- a/src/server/game/Conditions/DisableMgr.cpp +++ b/src/server/game/Conditions/DisableMgr.cpp @@ -309,8 +309,9 @@ bool IsDisabledFor(DisableType type, uint32 entry, Unit const* unit, uint8 flags return false; } - else if (flags & SPELL_DISABLE_DEPRECATED_SPELL) // call not from spellcast + else if (spellFlags & SPELL_DISABLE_DEPRECATED_SPELL) // call not from spellcast return true; + break; } case DISABLE_TYPE_MAP: if (Player const* player = unit->ToPlayer()) |