From 8ef61f3d401ff65a0080ce4d183eec359f75ede9 Mon Sep 17 00:00:00 2001
From: Blaymoira <none@none>
Date: Sun, 1 Mar 2009 18:36:05 +0100
Subject: *Prevent to kill spirit of redemption - by Sorken

--HG--
branch : trunk
---
 src/game/SpellEffects.cpp | 10 +---------
 src/game/Unit.cpp         |  2 ++
 2 files changed, 3 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index bdede08b469..91c1bec605e 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -339,14 +339,6 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
                         }
                         break;
                     }
-                    case 43648: //Electrical Storm
-                    {
-                        if(unitTarget && unitTarget->HasAura(44007, 0)) // Immune Aura
-                        {
-                            damage = 0;
-                        }
-                        break;
-                    }
                     // percent from health with min
                     case 25599:                             // Thundercrash
                     {
@@ -1234,7 +1226,7 @@ void Spell::EffectDummy(uint32 i)
 
                     m_caster->CastSpell(m_caster, 30452, true, NULL);
                     return;
-                }
+                }                
             }
 
             //All IconID Check in there
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 0fbeb5a9f7d..d3c58881516 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -12709,6 +12709,7 @@ void Unit::Kill(Unit *pVictim, bool durabilityLoss)
 
                 // FORM_SPIRITOFREDEMPTION and related auras
                 pVictim->CastSpell(pVictim,27827,true,NULL,*itr);
+                pVictim->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); // should not be attackable
                 SpiritOfRedemption = true;
                 break;
             }
@@ -12719,6 +12720,7 @@ void Unit::Kill(Unit *pVictim, bool durabilityLoss)
     {
         DEBUG_LOG("SET JUST_DIED");
         pVictim->setDeathState(JUST_DIED);
+        pVictim->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); // reactive attackable flag
     }
 
     // 10% durability loss on death
-- 
cgit v1.2.3