diff options
| author | Blaymoira <none@none> | 2009-03-01 18:36:05 +0100 |
|---|---|---|
| committer | Blaymoira <none@none> | 2009-03-01 18:36:05 +0100 |
| commit | 8ef61f3d401ff65a0080ce4d183eec359f75ede9 (patch) | |
| tree | 24d7635355e5b14e4f82f97e523e260ea5302c63 /src | |
| parent | a224d61b82bebaeedf486ad7766d6d3e25244f14 (diff) | |
*Prevent to kill spirit of redemption - by Sorken
--HG--
branch : trunk
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/SpellEffects.cpp | 10 | ||||
| -rw-r--r-- | src/game/Unit.cpp | 2 |
2 files changed, 3 insertions, 9 deletions
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 |