From 5eb8855f844cb80558b43e0c50d67b7a56c541a2 Mon Sep 17 00:00:00 2001 From: Amaru Date: Tue, 28 Jun 2011 19:16:54 +0300 Subject: [PATCH] [11699] fix reflect damage if caster can reflect too Signed-off-by: Laise --- src/game/Spell.cpp | 2 +- src/shared/revision_nr.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index 21f95381fb0..00b7ab8613e 100644 --- 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 index c2a29a4d9de..35d5295e9d2 100644 --- 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__