Fixed Forbearance. Also self-cast LoH will now correctly prevent Avenging Wrath for 30 s. Closes issue #1270. Thanks to _manuel_ for research.

--HG--
branch : trunk

1 files changed, 5 insertions, 1 deletions

diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index a5640ad4106..d563535b138 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -4757,7 +4757,11 @@ void Spell::EffectHealMaxHealth(uint32 /*i*/)
     if(m_spellInfo->SpellFamilyName == SPELLFAMILY_PALADIN) // Lay on Hands
     {
         if (m_caster && m_caster->GetGUID() == unitTarget->GetGUID())
-            m_caster->CastSpell(m_caster, 25771, true);
+        {
+            m_caster->CastSpell(m_caster, 25771, true); // Forbearance
+            m_caster->CastSpell(m_caster, 61988, true); // Immune shield marker (serverside)
+            m_caster->CastSpell(m_caster, 61987, true); // Avenging Wrath marker
+        }
 
         addhealth = m_caster->GetMaxHealth();
     }