mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-17 16:37:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[0180] Crashfixes in proc handlers. Close #19

Browse source 
Signed-off-by: Yaki Khadafi <ElSolDolLo@gmail.com>
This commit is contained in:
Yaki Khadafi 2012-08-24 21:57:46 +03:00 • committed by Antz
parent 8d93e79e29
commit 3013cd36d8
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/game/UnitAuraProcHandler.cpp
View file

@ -622,7 +622,7 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit* pVictim, uint32 damage, Aura
SpellEffectIndex effIndex = triggeredByAura->GetEffIndex(); SpellEffectIndex effIndex = triggeredByAura->GetEffIndex();
SpellEffectEntry const* dummySpellEffect = dummySpell->GetSpellEffect(effIndex); SpellEffectEntry const* dummySpellEffect = dummySpell->GetSpellEffect(effIndex);
SpellClassOptionsEntry const* dummyClassOptions = dummySpell->GetSpellClassOptions(); SpellClassOptionsEntry const* dummyClassOptions = dummySpell->GetSpellClassOptions();
SpellClassOptionsEntry const* procClassOptions = procSpell->GetSpellClassOptions(); SpellClassOptionsEntry const* procClassOptions = procSpell ? procSpell->GetSpellClassOptions() : NULL;
int32 triggerAmount = triggeredByAura->GetModifier()->m_amount; int32 triggerAmount = triggeredByAura->GetModifier()->m_amount;
Item* castItem = triggeredByAura->GetCastItemGuid() && GetTypeId() == TYPEID_PLAYER Item* castItem = triggeredByAura->GetCastItemGuid() && GetTypeId() == TYPEID_PLAYER
@ -2867,7 +2867,7 @@ SpellAuraProcResult Unit::HandleProcTriggerSpellAuraProc(Unit* pVictim, uint32 d
// Get triggered aura spell info // Get triggered aura spell info
SpellEntry const* auraSpellInfo = triggeredByAura->GetSpellProto(); SpellEntry const* auraSpellInfo = triggeredByAura->GetSpellProto();
SpellClassOptionsEntry const* auraClassOptions = auraSpellInfo->GetSpellClassOptions(); SpellClassOptionsEntry const* auraClassOptions = auraSpellInfo->GetSpellClassOptions();
SpellClassOptionsEntry const* procClassOptions = procSpell->GetSpellClassOptions(); SpellClassOptionsEntry const* procClassOptions = procSpell ? procSpell->GetSpellClassOptions() : NULL;
// Basepoints of trigger aura // Basepoints of trigger aura
int32 triggerAmount = triggeredByAura->GetModifier()->m_amount; int32 triggerAmount = triggeredByAura->GetModifier()->m_amount;

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "0179" #define REVISION_NR "0180"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__