diff options
Diffstat (limited to 'src/game/SpellEffects.cpp')
| -rw-r--r-- | src/game/SpellEffects.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index e7c67f4f41e..f4842154ed8 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -4370,16 +4370,10 @@ void Spell::SpellDamageWeaponDmg(uint32 i) Unit::AuraList const& list = unitTarget->GetAurasByType(SPELL_AURA_MOD_RESISTANCE); for(Unit::AuraList::const_iterator itr=list.begin();itr!=list.end();++itr) { -<<<<<<< HEAD:src/game/SpellEffects.cpp SpellEntry const *proto = (*itr)->GetSpellProto(); if(proto->SpellFamilyName == SPELLFAMILY_WARRIOR - && proto->SpellFamilyFlags == SPELLFAMILYFLAG_WARRIOR_SUNDERARMOR) -======= - SpellEntry const *spellInfo = (*itr).second->GetSpellProto(); - if( spellInfo->SpellFamilyName == SPELLFAMILY_WARRIOR && - spellInfo->SpellFamilyFlags & 0x0000000000004000LL && - (*itr).second->GetCasterGUID() == m_caster->GetGUID()) ->>>>>>> upstream/master:src/game/SpellEffects.cpp + && proto->SpellFamilyFlags == SPELLFAMILYFLAG_WARRIOR_SUNDERARMOR + && (*itr)->GetCasterGUID() == m_caster->GetGUID()) { (*itr)->RefreshAura(); stack = (*itr)->GetStackAmount(); |