diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-09-04 19:08:22 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-09-04 19:08:22 +0100 |
| commit | 5ee22a8006d2c6ba5995bee96b530a802d85fbc3 (patch) | |
| tree | 4094b91bf4a63bcc7cb60fe539ff01288f0cd7d3 /src/server/game/Spells/SpellInfo.cpp | |
| parent | a005d4a9e31a294e00d256652080f2d872509046 (diff) | |
| parent | 73172c67f02b8f2649b762262d54aea7b7f94d07 (diff) | |
Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Spells/SpellInfo.cpp
src/server/scripts/Commands/cs_misc.cpp
Diffstat (limited to 'src/server/game/Spells/SpellInfo.cpp')
| -rw-r--r-- | src/server/game/Spells/SpellInfo.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp index 8fa008da823..21bffaee433 100644 --- a/src/server/game/Spells/SpellInfo.cpp +++ b/src/server/game/Spells/SpellInfo.cpp @@ -367,7 +367,7 @@ bool SpellEffectInfo::IsAura() const bool SpellEffectInfo::IsAura(AuraType aura) const { - return IsAura() && AuraType(ApplyAuraName) == aura; + return IsAura() && AuraType(ApplyAuraName) == uint32(aura); } bool SpellEffectInfo::IsTargetingArea() const |