diff options
| author | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-01-07 16:39:01 +0100 |
|---|---|---|
| committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-01-07 16:39:01 +0100 |
| commit | ecedb798aa3094f02bedaadf459cfec7cb7c58a4 (patch) | |
| tree | 1666ff41bed0084e13094ac53c1b2334a22bec3f /src/server/game/Conditions/DisableMgr.cpp | |
| parent | d5163d846fcbbd94655f0ba93c81a3e2bd302b3c (diff) | |
| parent | d0e4e202658206aa40e656101334b446ebc9f18e (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Conditions/ConditionMgr.h
Diffstat (limited to 'src/server/game/Conditions/DisableMgr.cpp')
| -rw-r--r-- | src/server/game/Conditions/DisableMgr.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/server/game/Conditions/DisableMgr.cpp b/src/server/game/Conditions/DisableMgr.cpp index 8cd36827ab9..fefb51323c4 100644 --- a/src/server/game/Conditions/DisableMgr.cpp +++ b/src/server/game/Conditions/DisableMgr.cpp @@ -310,6 +310,8 @@ bool IsDisabledFor(DisableType type, uint32 entry, Unit const* unit, uint8 flags } else if (spellFlags & SPELL_DISABLE_DEPRECATED_SPELL) // call not from spellcast return true; + else if (flags & SPELL_DISABLE_LOS) + return spellFlags & SPELL_DISABLE_LOS; break; } |