Core/Misc: Fixed some duplicate checks for player typeid in Unit::Kill and Spell::EffectSummonDeadPet. Also some random cleanup

2011-12-10 13:48:41 +01:00
parent b10477a166
commit 11fb0beaf0
5 changed files with 31 additions and 47 deletions
@@ -6432,14 +6432,15 @@ void Spell::EffectSummonDeadPet(SpellEffIndex /*effIndex*/)
    if (effectHandleMode != SPELL_EFFECT_HANDLE_HIT)
        return;

-    if (m_caster->GetTypeId() != TYPEID_PLAYER)
+    Player* _player = m_caster->ToPlayer()
+
+    if (!_player)
        return;
-    Player* _player = m_caster->ToPlayer();
+
    Pet* pet = _player->GetPet();
-    if (!pet)
-        return;
-    if (pet->isAlive())
+    if (!pet || pet->isAlive())
        return;
+
    if (damage < 0)
        return;