Core/Units: Aura´s of type SPELL_AURA_MOD_RESISTANCE_EXCLUSIVE (143) should stack with eachother in the way that only the strongest aura of each magical school applies.

Author: Iskander
Fixes issue #3897

--HG--
branch : trunk
This commit is contained in:
Machiavelli committed 2010-12-17 20:31:46 +01:00
1 parent 97f912fe93
commit 32d94ed52a
3 files changed
+10 -6

No files matched your search

+2 -2
View File
@@ -4680,14 +4680,14 @@ float Unit::GetTotalAuraMultiplierByMiscMask(AuraType auratype, uint32 misc_mask
return multiplier;
}
int32 Unit::GetMaxPositiveAuraModifierByMiscMask(AuraType auratype, uint32 misc_mask) const
int32 Unit::GetMaxPositiveAuraModifierByMiscMask(AuraType auratype, uint32 misc_mask, const AuraEffect* except) const
{
int32 modifier = 0;
AuraEffectList const& mTotalAuraList = GetAuraEffectsByType(auratype);
for (AuraEffectList::const_iterator i = mTotalAuraList.begin(); i != mTotalAuraList.end(); ++i)
{
if ((*i)->GetMiscValue()& misc_mask && (*i)->GetAmount() > modifier)
if (except != (*i) && (*i)->GetMiscValue()& misc_mask && (*i)->GetAmount() > modifier)
modifier = (*i)->GetAmount();
}