From bc2b02708f377bae74241b2077f17bc554da07d2 Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Wed, 1 Jul 2009 17:50:26 -0500
Subject: [PATCH] [8093] Fixed effect of spell 25771. Author: ApoC

--HG--
branch : trunk
---
 src/game/SpellAuras.cpp   | 5 +++++
 src/game/SpellEffects.cpp | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index dc98be3bfa0..c1efbf24432 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -4338,6 +4338,11 @@ void AuraEffect::HandleModMechanicImmunity(bool apply, bool Real, bool /*changeA
     //immune movement impairment and loss of control
     if(GetId()==42292 || GetId()==59752)
         mechanic=IMMUNE_TO_MOVEMENT_IMPAIRMENT_AND_LOSS_CONTROL_MASK;
+    // Forbearance
+    // in DBC wrong mechanic immune since 3.0.x
+    else if (GetId() == 25771)   
+        mechanic = 1 << MECHANIC_IMMUNE_SHIELD;
+
     if (!mechanic)
         return;
 
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index 44cbc2f04f1..6aeb5f90869 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -6159,7 +6159,7 @@ void Spell::EffectCharge2(uint32 /*i*/)
     {
         target->GetContactPoint(m_caster, x, y, z);
         // not all charge effects used in negative spells
-        if ( !IsPositiveSpell(m_spellInfo->Id) && m_caster->GetTypeId() == TYPEID_PLAYER)
+        if(!IsPositiveSpell(m_spellInfo->Id) && m_caster->GetTypeId() == TYPEID_PLAYER)
             m_caster->Attack(target, true);
     }
     else