diff options
| author | thenecromancer <none@none> | 2010-01-24 15:21:01 +0100 |
|---|---|---|
| committer | thenecromancer <none@none> | 2010-01-24 15:21:01 +0100 |
| commit | 897bd3e1a9fd06205daf30cdc96994ae57f586da (patch) | |
| tree | c74186367e7879e71b9d3a9893609c031c367bb8 /src | |
| parent | 963731abc8f468fb62aca8f7f65b8dc164f6e9d8 (diff) | |
| parent | 1fd2292d7319a42197ac1f73a4825b86b5527764 (diff) | |
Merge
--HG--
branch : trunk
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/Unit.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index b16f7f7a9dc..2ef69144086 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -4552,6 +4552,8 @@ bool Unit::HasAuraTypeWithValue(AuraType auratype, uint32 value) const bool Unit::HasNegativeAuraWithInterruptFlag(uint32 flag) { + if (!(m_interruptMask & flag)) + return false; for (AuraApplicationList::iterator iter = m_interruptableAuras.begin(); iter != m_interruptableAuras.end(); ++iter) { if (!(*iter)->IsPositive() && (*iter)->GetBase()->GetSpellProto()->AuraInterruptFlags & flag) |