Merge pull request #3162 from megamage/master

Fix incorrect logic in PetAI. Solve #3155.
2011-09-26 06:44:33 -07:00
parent 7b68a6bf69 780747f5d3
commit 6dc09248fd
3 changed files with 25 additions and 34 deletions
@@ -167,9 +167,11 @@ class spell_dk_anti_magic_zone : public SpellScriptLoader
            {
                SpellInfo const* talentSpell = sSpellMgr->GetSpellInfo(DK_SPELL_ANTI_MAGIC_SHELL_TALENT);
                amount = talentSpell->Effects[EFFECT_0].CalcValue(GetCaster());
-                // assume caster is a player here
-                if (Unit* caster = GetCaster())
-                     amount += int32(2 * caster->ToPlayer()->GetTotalAttackPowerValue(BASE_ATTACK));
+                Unit* caster = GetCaster();
+                if(!caster)
+                    return;
+                if(Player* player = caster->ToPlayer())
+                     amount += int32(2 * player->GetTotalAttackPowerValue(BASE_ATTACK));
            }

            void Absorb(AuraEffect*  /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount)