aboutsummaryrefslogtreecommitdiff
path: root/src/game/SpellAuraEffects.cpp
diff options
context:
space:
mode:
authorthenecromancer <none@none>2010-03-08 17:20:25 +0100
committerthenecromancer <none@none>2010-03-08 17:20:25 +0100
commit2cc15aee31e36d408114ab2d90efe05f92c8041f (patch)
treeab1ce96717a5ca19e6c12f076172861190e956f5 /src/game/SpellAuraEffects.cpp
parent887583bf092bf3956db493c259d7c5c14c2b5eff (diff)
Fix crash in AuraEffect::HandleShapeshiftBoosts
Add check to Spell::EffectSanctuary before casting (ensuring all appearances of "(Player *)" (whitespace incl.) are correct) --HG-- branch : trunk
Diffstat (limited to 'src/game/SpellAuraEffects.cpp')
-rw-r--r--src/game/SpellAuraEffects.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/game/SpellAuraEffects.cpp b/src/game/SpellAuraEffects.cpp
index 0c21a509677..7d2f1b343e0 100644
--- a/src/game/SpellAuraEffects.cpp
+++ b/src/game/SpellAuraEffects.cpp
@@ -2509,10 +2509,13 @@ void AuraEffect::HandleShapeshiftBoosts(Unit * target, bool apply) const
target->RemoveAurasDueToSpell(spellId2);
// Improved Barkskin - apply/remove armor bonus due to shapeshift
- if (target->ToPlayer()->HasSpell(63410) || target->ToPlayer()->HasSpell(63411))
+ if (Player *pl=target->ToPlayer())
{
- target->RemoveAurasDueToSpell(66530);
- target->CastSpell(target,66530,true);
+ if (pl->HasSpell(63410) || pl->HasSpell(63411))
+ {
+ target->RemoveAurasDueToSpell(66530);
+ target->CastSpell(target,66530,true);
+ }
}
Unit::AuraApplicationMap& tAuras = target->GetAppliedAuras();