aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2011-09-30 18:45:49 +0200
committerShauren <shauren.trinity@gmail.com>2011-09-30 18:45:49 +0200
commit2a34c5e4c8815aae6b03ac53189d45376c606a77 (patch)
treef12bb8f46caa7b25dbef1aa4e1d8d4e3a92e386b /src
parent8305b0240b3402f799a4a68dc850ca51c755c7f5 (diff)
Core/Auras: Fixed crashes in Infusion of Light and Frozen Power proc handlers
Closes #3271 & #3272
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Entities/Unit/Unit.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index b0c662cb406..6f042e7f0c4 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -7271,6 +7271,8 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere
// Frozen Power
if (dummySpell->SpellIconID == 3780)
{
+ if (!target)
+ return false;
if (GetDistance(target) < 15.0f)
return false;
float chance = (float)triggerAmount;
@@ -7943,7 +7945,7 @@ bool Unit::HandleAuraProc(Unit* victim, uint32 damage, Aura* triggeredByAura, Sp
if (procSpell->SpellFamilyFlags[0] & 0x40000000 && procSpell->SpellIconID == 242)
{
*handled = true;
- if (victim->HasAura(53601))
+ if (victim && victim->HasAura(53601))
{
int32 bp0 = CalculatePctN(int32(damage / 12), dummySpell->Effects[EFFECT_2]. CalcValue());
// Item - Paladin T9 Holy 4P Bonus