Core/Spells: Fixed crash with m_delayMoment calculation for reflected…

… spells
TrinityCore · Mar 20, 2018 · 2e47bce · 2e47bce
1 parent 5734788
commit 2e47bce
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp
@@ -2182,10 +2182,6 @@ void Spell::AddUnitTarget(Unit* target, uint32 effectMask, bool checkIfValid /*=
             targetInfo.timeDelay = uint64(std::floor(dist / m_spellInfo->Speed * 1000.0f));
         else
             targetInfo.timeDelay = uint64(m_spellInfo->Speed * 1000.0f);
-
-        // Calculate minimum incoming time
-        if (!m_delayMoment || m_delayMoment > targetInfo.timeDelay)
-            m_delayMoment = targetInfo.timeDelay;
     }
     else
         targetInfo.timeDelay = 0ULL;
@@ -2205,6 +2201,10 @@ void Spell::AddUnitTarget(Unit* target, uint32 effectMask, bool checkIfValid /*=
     else
         targetInfo.reflectResult = SPELL_MISS_NONE;
 
+    // Calculate minimum incoming time
+    if (targetInfo.timeDelay && (!m_delayMoment || m_delayMoment > targetInfo.timeDelay))
+        m_delayMoment = targetInfo.timeDelay;
+
     // Add target to list
     m_UniqueTargetInfo.push_back(targetInfo);
 }