[11699] fix reflect damage if caster can reflect too

Signed-off-by: Laise <fenrisse@gmail.com>
mangos · Jun 28, 2011 · 5eb8855 · 5eb8855
1 parent 3b9ed36
commit 5eb8855
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
@@ -1388,7 +1388,7 @@ void Spell::HandleDelayedSpellLaunch(TargetInfo *target)
     SpellNonMeleeDamage damageInfo(caster, unitTarget, m_spellInfo->Id, m_spellSchoolMask);
 
     // keep damage amount for reflected spells
-    if (missInfo == SPELL_MISS_NONE || missInfo == SPELL_MISS_REFLECT)
+    if (missInfo == SPELL_MISS_NONE || (missInfo == SPELL_MISS_REFLECT && target->reflectResult == SPELL_MISS_NONE))
     {
         for (int32 effectNumber = 0; effectNumber < MAX_EFFECT_INDEX; ++effectNumber)
         {

diff --git 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 "11698"
+ #define REVISION_NR "11699"
 #endif // __REVISION_NR_H__