diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Conditions/DisableMgr.h | 2 | ||||
| -rw-r--r-- | src/server/game/Spells/Auras/SpellAuras.cpp | 8 | ||||
| -rw-r--r-- | src/server/game/Spells/Auras/SpellAuras.h | 8 |
3 files changed, 10 insertions, 8 deletions
diff --git a/src/server/game/Conditions/DisableMgr.h b/src/server/game/Conditions/DisableMgr.h index 1a1480bdcca..68b1ec17045 100644 --- a/src/server/game/Conditions/DisableMgr.h +++ b/src/server/game/Conditions/DisableMgr.h @@ -21,7 +21,7 @@ #include "Define.h" -class Unit; +class WorldObject; enum DisableType { diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp index 1e1a4ec2acc..51365f2938f 100644 --- a/src/server/game/Spells/Auras/SpellAuras.cpp +++ b/src/server/game/Spells/Auras/SpellAuras.cpp @@ -1078,6 +1078,14 @@ bool Aura::IsDeathPersistent() const return GetSpellInfo()->IsDeathPersistent(); } +bool Aura::IsRemovedOnShapeLost(Unit* target) const +{ + return GetCasterGUID() == target->GetGUID() + && m_spellInfo->Stances + && !m_spellInfo->HasAttribute(SPELL_ATTR2_NOT_NEED_SHAPESHIFT) + && !m_spellInfo->HasAttribute(SPELL_ATTR0_NOT_SHAPESHIFT); +} + bool Aura::CanBeSaved() const { if (IsPassive()) diff --git a/src/server/game/Spells/Auras/SpellAuras.h b/src/server/game/Spells/Auras/SpellAuras.h index 31ac19e9d04..07431514d3f 100644 --- a/src/server/game/Spells/Auras/SpellAuras.h +++ b/src/server/game/Spells/Auras/SpellAuras.h @@ -173,13 +173,7 @@ class TC_GAME_API Aura bool IsPassive() const; bool IsDeathPersistent() const; - bool IsRemovedOnShapeLost(Unit* target) const - { - return GetCasterGUID() == target->GetGUID() - && m_spellInfo->Stances - && !m_spellInfo->HasAttribute(SPELL_ATTR2_NOT_NEED_SHAPESHIFT) - && !m_spellInfo->HasAttribute(SPELL_ATTR0_NOT_SHAPESHIFT); - } + bool IsRemovedOnShapeLost(Unit* target) const; bool CanBeSaved() const; bool IsRemoved() const { return m_isRemoved; } |