aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQAston <none@none>2009-06-25 15:34:08 +0200
committerQAston <none@none>2009-06-25 15:34:08 +0200
commit4ca17d413703a8fdb51018f4b95a6682ad8f80d0 (patch)
treef28450664c5359f980055202d20029611ef1c856
parentbbc1578ab5e4039e9e496df417101262afde36a7 (diff)
*Fix Recently bandagd debuf - by Maxxie
*Prevent possible crash in Chimera Shot handler. --HG-- branch : trunk
-rw-r--r--src/game/SpellAuras.cpp4
-rw-r--r--src/game/SpellEffects.cpp2
2 files changed, 6 insertions, 0 deletions
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)