diff options
Diffstat (limited to 'src/game')
| -rw-r--r-- | src/game/SpellMgr.cpp | 1 | ||||
| -rw-r--r-- | src/game/Unit.cpp | 14 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp index 86c1fa1afe6..0f090c78525 100644 --- a/src/game/SpellMgr.cpp +++ b/src/game/SpellMgr.cpp @@ -2170,6 +2170,7 @@ void SpellMgr::LoadSpellCustomAttr() case 37790: //Spread Shot case 46771: //Flame Sear case 45248: //Shadow Blades + case 41303: // Soul Drain spellInfo->MaxAffectedTargets = 3; break; case 38310: //Multi-Shot diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index e635efa0457..9d768454c18 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -557,11 +557,16 @@ uint32 Unit::DealDamage(Unit *pVictim, uint32 damage, CleanDamage const* cleanDa } } } - } - + } + if (damagetype != NODAMAGE) + { + // interrupting auras with AURA_INTERRUPT_FLAG_DAMAGE before checking !damage (absorbed damage breaks that type of auras) + pVictim->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_DAMAGE, spellProto ? spellProto->Id : 0); + pVictim->RemoveSpellbyDamageTaken(damage, spellProto ? spellProto->Id : 0); + } - if(!damage) //when will zero damage? need interrupt aura? + if(!damage) { // Rage from physical damage received . if(cleanDamage && cleanDamage->damage && (damageSchoolMask & SPELL_SCHOOL_MASK_NORMAL) && pVictim->GetTypeId() == TYPEID_PLAYER && (pVictim->getPowerType() == POWER_RAGE)) @@ -893,9 +898,6 @@ uint32 Unit::DealDamage(Unit *pVictim, uint32 damage, CleanDamage const* cleanDa if (damagetype != NODAMAGE && damage)// && pVictim->GetTypeId() == TYPEID_PLAYER) { - pVictim->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_DAMAGE, spellProto ? spellProto->Id : 0); - pVictim->RemoveSpellbyDamageTaken(damage, spellProto ? spellProto->Id : 0); - /*const SpellEntry *se = i->second->GetSpellProto(); next = i; ++next; if (spellProto && spellProto->Id == se->Id) // Not drop auras added by self |