aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorQAston <none@none>2009-07-06 13:36:28 +0200
committerQAston <none@none>2009-07-06 13:36:28 +0200
commitb46ee65dc02eed481bac08220414bdcde77d1537 (patch)
tree7101bca917e633bc28b509333d4c2066a0a19cf0 /src
parent6ee9ed44783436cddc2875096848ec90441e53e0 (diff)
*PRevent crash with proc of melee based destination targetted spells.
--HG-- branch : trunk
Diffstat (limited to 'src')
-rw-r--r--src/game/Unit.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 10867f501c1..33a6c55433f 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -12519,8 +12519,8 @@ void Unit::ProcDamageAndSpellFor( bool isVictim, Unit * pTarget, uint32 procFlag
// Player is loaded now - do not allow passive spell casts to proc
if (GetTypeId() == TYPEID_PLAYER && ((Player*)this)->GetSession()->PlayerLoading())
return;
- // For melee/ranged based attack need update skills and set some Aura states
- if (procFlag & MELEE_BASED_TRIGGER_MASK)
+ // For melee/ranged based attack need update skills and set some Aura states if victim present
+ if (procFlag & MELEE_BASED_TRIGGER_MASK && pTarget)
{
// Update skills here for players
if (GetTypeId() == TYPEID_PLAYER)