aboutsummaryrefslogtreecommitdiff
path: root/src/game/SpellEffects.cpp
diff options
context:
space:
mode:
authorQAston <none@none>2009-06-06 22:11:33 +0200
committerQAston <none@none>2009-06-06 22:11:33 +0200
commitefbf91102640dcc5e73a9d5826a57de6195430a2 (patch)
treed750d09f2a45e7a520d2aaecb237f4bddda418ff /src/game/SpellEffects.cpp
parent745a86cdf126952abbfba396ba01b202748ae199 (diff)
*Fix demonic circle - original patch by Astellar
--HG-- branch : trunk
Diffstat (limited to 'src/game/SpellEffects.cpp')
-rw-r--r--src/game/SpellEffects.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index 661eef708ea..dd85148022b 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -5669,7 +5669,13 @@ void Spell::EffectSummonObject(uint32 i)
if( m_caster )
obj = m_caster->GetMap()->GetGameObject(guid);
- if(obj) obj->Delete();
+ if(obj)
+ {
+ // Recast case - null spell id to make auras not be removed on object remove from world
+ if (m_spellInfo->Id == obj->GetSpellId())
+ obj->SetSpellId(0);
+ obj->Delete();
+ }
m_caster->m_ObjectSlot[slot] = 0;
}