diff options
author | Trazom62 <none@none> | 2010-03-22 14:07:08 +0100 |
---|---|---|
committer | Trazom62 <none@none> | 2010-03-22 14:07:08 +0100 |
commit | 248286c08d5dc82675271f715bff4643aee4a880 (patch) | |
tree | 6480d8fcda4693ca6cc90633a19cb2dee6c87786 /src/game/Unit.cpp | |
parent | daf5ce32aaf106e0114cddbc76ee83424dd7c14c (diff) |
Fix Crash in XT-002 (Gravity Bomb proc). Fixes issue #734.
Fix compilation warning.
Fix typo in Freya soundid.
--HG--
branch : trunk
Diffstat (limited to 'src/game/Unit.cpp')
-rw-r--r-- | src/game/Unit.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 4f97861c9a1..fabc476e8ff 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -14314,7 +14314,11 @@ bool Unit::IsTriggeredAtSpellProcEvent(Unit *pVictim, Aura * aura, SpellEntry co // In most cases req get honor or XP from kill if (EventProcFlag & PROC_FLAG_KILL && GetTypeId() == TYPEID_PLAYER) { - bool allow = this->ToPlayer()->isHonorOrXPTarget(pVictim); + bool allow = false; + + if (pVictim) + allow = ToPlayer()->isHonorOrXPTarget(pVictim); + // Shadow Word: Death - can trigger from every kill if (aura->GetId() == 32409) allow = true; |