From a6b1334ba1e946efb1e8e82b602937cd1a900927 Mon Sep 17 00:00:00 2001 From: nos4r2zod Date: Mon, 20 Jul 2009 12:34:54 +0400 Subject: [PATCH] [8219] Avoid hunter traps proccing when deleted at replace by another trap. Signed-off-by: VladimirMangos --- src/game/SpellEffects.cpp | 10 +++------- src/shared/revision_nr.h | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index 366978200..5c36d8db0 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -5749,14 +5749,10 @@ void Spell::EffectSummonObject(uint32 i) default: return; } - uint64 guid = m_caster->m_ObjectSlot[slot]; - if(guid != 0) + if(uint64 guid = m_caster->m_ObjectSlot[slot]) { - GameObject* obj = NULL; - if( m_caster ) - obj = m_caster->GetMap()->GetGameObject(guid); - - if(obj) obj->Delete(); + if(GameObject* obj = m_caster ? m_caster->GetMap()->GetGameObject(guid) : NULL) + obj->SetLootState(GO_JUST_DEACTIVATED); m_caster->m_ObjectSlot[slot] = 0; } diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index ef4d395cd..1b2589e17 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 "8218" + #define REVISION_NR "8219" #endif // __REVISION_NR_H__