From c0df97276815f6bdf10b3df938e242bec13d2a8b Mon Sep 17 00:00:00 2001 From: Shauren Date: Tue, 5 Jul 2016 00:02:04 +0200 Subject: Core/Spells: Fixed crash with DEST targets added in b3d814ee50b265c140d65b6f92ce42482ce1f39b --- src/server/game/Spells/Spell.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/server') diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 2b59926fa33..1068e406e78 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -6906,8 +6906,11 @@ bool SpellEvent::Execute(uint64 e_time, uint32 p_time) // delaying had just started, record the moment m_Spell->SetDelayStart(e_time); // handle effects on caster if the spell has travel time but also affects the caster in some way - uint64 n_offset = m_Spell->handle_delayed(0); - ASSERT(n_offset == m_Spell->GetDelayMoment()); + if (!m_Spell->m_targets.HasDst()) + { + uint64 n_offset = m_Spell->handle_delayed(0); + ASSERT(n_offset == m_Spell->GetDelayMoment()); + } // re-plan the event for the delay moment m_Spell->GetCaster()->m_Events.AddEvent(this, e_time + m_Spell->GetDelayMoment(), false); return false; // event not complete -- cgit v1.2.3