From fa58e269344e13bb0145e79bd80b542fbda1af81 Mon Sep 17 00:00:00 2001 From: rsa Date: Tue, 10 Apr 2012 12:48:46 +0400 Subject: [PATCH] possible fix for double-charge effect. related to #873. testing. --- src/game/PointMovementGenerator.h | 1 + src/game/Spell.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/game/PointMovementGenerator.h b/src/game/PointMovementGenerator.h index f25b46f3d51..92464401875 100644 --- a/src/game/PointMovementGenerator.h +++ b/src/game/PointMovementGenerator.h @@ -71,6 +71,7 @@ class EffectMovementGenerator : public MovementGenerator void Reset(Unit &) {} bool Update(Unit &u, const uint32 &); MovementGeneratorType GetMovementGeneratorType() const { return EFFECT_MOTION_TYPE; } + const char* Name() const { return ""; } private: uint32 m_Id; }; diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index 3f775d39561..d7d71533a7e 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -1098,7 +1098,7 @@ void Spell::DoAllEffectOnTarget(TargetInfo *target) damageInfo.procVictim = PROC_FLAG_NONE; } - if (m_spellInfo->speed > 0) + if (m_spellInfo->speed > 0 || GetDelayStart()) { // mark effects that were already handled in Spell::HandleDelayedSpellLaunch on spell launch as processed for (int32 i = 0; i < MAX_EFFECT_INDEX; ++i)