diff options
| author | Subv <s.v.h21@hotmail.com> | 2012-12-04 05:19:24 -0800 |
|---|---|---|
| committer | Subv <s.v.h21@hotmail.com> | 2012-12-04 05:19:24 -0800 |
| commit | 1f55b890b7c07fea4bae75efbd7e20d754f5b434 (patch) | |
| tree | 0c7d310656ab8b9a26d32ccc9e4cc8db0bdb24bb | |
| parent | 0a3972db7cd472f6172d3aac60d4c2d1f96a517d (diff) | |
| parent | 6b1ffb98ce3ecbd68d700cdd6e17fdf3aa8dec77 (diff) | |
Merge pull request #8560 from ille/pointercheck02
Core/Spells: Add safety NULL check for Evasive Maneuvers proc.
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 9e19a717790..c469edd1112 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -7553,7 +7553,7 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere //Glyph of Unholy Blight if (AuraEffect* glyph=GetAuraEffect(63332, 0)) AddPct(basepoints0, glyph->GetAmount()); - + basepoints0 = basepoints0 / (unholyBlight->GetMaxDuration() / unholyBlight->Effects[0].Amplitude); basepoints0 += victim->GetRemainingPeriodicAmount(GetGUID(), triggered_spell_id, SPELL_AURA_PERIODIC_DAMAGE); break; @@ -8228,7 +8228,7 @@ bool Unit::HandleProcTriggerSpell(Unit* victim, uint32 damage, AuraEffect* trigg case 40336: { // On successful melee or ranged attack gain $29471s1 mana and if possible drain $27526s1 mana from the target. - if (this && isAlive()) + if (isAlive()) CastSpell(this, 29471, true, castItem, triggeredByAura); if (victim && victim->isAlive()) CastSpell(victim, 27526, true, castItem, triggeredByAura); @@ -8239,7 +8239,7 @@ bool Unit::HandleProcTriggerSpell(Unit* victim, uint32 damage, AuraEffect* trigg { // Remove a Evasive Charge Aura* charge = GetAura(50241); - if (charge->ModStackAmount(-1, AURA_REMOVE_BY_ENEMY_SPELL)) + if (charge && charge->ModStackAmount(-1, AURA_REMOVE_BY_ENEMY_SPELL)) RemoveAurasDueToSpell(50240); } } |