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

This commit is contained in:
kaelima committed 2011-12-10 13:48:41 +01:00
1 parent b10477a166
commit 11fb0beaf0
5 files changed
+31 -47

No files matched your search

+8 -20
View File
@@ -15593,29 +15593,17 @@ void Unit::Kill(Unit* victim, bool durabilityLoss)
}
// Hook for OnPVPKill Event
if (GetTypeId() == TYPEID_PLAYER)
if (Player* killerPlr = ToPlayer())
{
if (victim->GetTypeId() == TYPEID_PLAYER)
{
Player* killer = ToPlayer();
Player* killed = victim->ToPlayer();
sScriptMgr->OnPVPKill(killer, killed);
}
else if (victim->GetTypeId() == TYPEID_UNIT)
{
Player* killer = ToPlayer();
Creature* killed = victim->ToCreature();
sScriptMgr->OnCreatureKill(killer, killed);
}
if (Player* killedPlr = victim->ToPlayer())
sScriptMgr->OnPVPKill(killerPlr, killedPlr);
else if (Creature* killedCre = victim->ToCreature())
sScriptMgr->OnCreatureKill(killerPlr, killedCre);
}
else if (GetTypeId() == TYPEID_UNIT)
else if (Creature* killerCre = ToCreature())
{
if (victim->GetTypeId() == TYPEID_PLAYER)
{
Creature* killer = ToCreature();
Player* killed = victim->ToPlayer();
sScriptMgr->OnPlayerKilledByCreature(killer, killed);
}
if (Player* killed = victim->ToPlayer())
sScriptMgr->OnPlayerKilledByCreature(killerCre, killed);
}
if (victim->GetVehicle())