From 4ca17d413703a8fdb51018f4b95a6682ad8f80d0 Mon Sep 17 00:00:00 2001
From: QAston <none@none>
Date: Thu, 25 Jun 2009 15:34:08 +0200
Subject: *Fix Recently bandagd debuf - by Maxxie *Prevent possible crash in
 Chimera Shot handler.

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

(limited to 'src')

diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index 94555952916..502c6a3a8e3 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -2616,6 +2616,10 @@ void AuraEffect::HandleAuraDummy(bool apply, bool Real, bool changeAmount)
                 break;
             switch(GetId())
             {
+                // Recently Bandaged
+                case 11196:
+                    m_target->ApplySpellImmune(GetId(), IMMUNITY_MECHANIC, GetMiscValue(), apply);
+                    return;
                 // Unstable Power
                 case 24658:
                 {
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index e9a358a05c2..7b3ca12c61e 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -5277,6 +5277,8 @@ void Spell::EffectScriptEffect(uint32 effIndex)
                         flag96 familyFlag = aura->GetSpellProto()->SpellFamilyFlags;
                         if (!(familyFlag[1] & 0x00000080 || familyFlag[0] & 0x0000C000))
                             continue;
+                        if (!aura->GetPartAura(0))
+                            continue;
 
                         // Serpent Sting - Instantly deals 40% of the damage done by your Serpent Sting.
                         if (familyFlag[0] & 0x4000)
-- 
cgit v1.2.3