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
This commit is contained in:
commit
5ee22a8006
15 files changed
+44
-43
No files matched your search
@@ -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
|
||||
|
||||
Reference in new issue
Block a user