From 3013cd36d8323629741e181c0593cc46c9c139a0 Mon Sep 17 00:00:00 2001 From: Yaki Khadafi Date: Fri, 24 Aug 2012 21:57:46 +0300 Subject: [PATCH] [0180] Crashfixes in proc handlers. Close #19 Signed-off-by: Yaki Khadafi --- src/game/UnitAuraProcHandler.cpp | 4 ++-- src/shared/revision_nr.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/game/UnitAuraProcHandler.cpp b/src/game/UnitAuraProcHandler.cpp index 7e9e608f0..30b9c4104 100644 --- a/src/game/UnitAuraProcHandler.cpp +++ b/src/game/UnitAuraProcHandler.cpp @@ -622,7 +622,7 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit* pVictim, uint32 damage, Aura SpellEffectIndex effIndex = triggeredByAura->GetEffIndex(); SpellEffectEntry const* dummySpellEffect = dummySpell->GetSpellEffect(effIndex); SpellClassOptionsEntry const* dummyClassOptions = dummySpell->GetSpellClassOptions(); - SpellClassOptionsEntry const* procClassOptions = procSpell->GetSpellClassOptions(); + SpellClassOptionsEntry const* procClassOptions = procSpell ? procSpell->GetSpellClassOptions() : NULL; int32 triggerAmount = triggeredByAura->GetModifier()->m_amount; Item* castItem = triggeredByAura->GetCastItemGuid() && GetTypeId() == TYPEID_PLAYER @@ -2867,7 +2867,7 @@ SpellAuraProcResult Unit::HandleProcTriggerSpellAuraProc(Unit* pVictim, uint32 d // Get triggered aura spell info SpellEntry const* auraSpellInfo = triggeredByAura->GetSpellProto(); SpellClassOptionsEntry const* auraClassOptions = auraSpellInfo->GetSpellClassOptions(); - SpellClassOptionsEntry const* procClassOptions = procSpell->GetSpellClassOptions(); + SpellClassOptionsEntry const* procClassOptions = procSpell ? procSpell->GetSpellClassOptions() : NULL; // Basepoints of trigger aura int32 triggerAmount = triggeredByAura->GetModifier()->m_amount; diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 538fb22bf..5f821c0c9 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ -#define REVISION_NR "0179" +#define REVISION_NR "0180" #endif // __REVISION_NR_H__