mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-14 16:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[12152] Remove unused argument from OutdoorPvP::HandlePlayerKillInsideArea

Browse source
This commit is contained in:
stfx 2012-08-28 23:29:05 +02:00 • committed by Antz
parent f2cf0bcd19
commit a53ac2aca7
10 changed files with 33 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/game/Unit.cpp
View file

@ -1114,26 +1114,29 @@ uint32 Unit::DealDamage(Unit* pVictim, uint32 damage, CleanDamage const* cleanDa
he->DuelComplete(DUEL_INTERUPTED);
}
// handle player kill in outdoor pvp
if (player_tap && pVictim->GetTypeId() == TYPEID_PLAYER && pVictim != this)
// handle player/npc kill in battleground or outdoor pvp script
if (player_tap)
{
if (OutdoorPvP* outdoorPvP = sOutdoorPvPMgr.GetScript(player_tap->GetCachedZoneId()))
outdoorPvP->HandlePlayerKill(player_tap, pVictim);
}
// battleground things (do this at the end, so the death state flag will be properly set to handle in the bg->handlekill)
if (pVictim->GetTypeId() == TYPEID_PLAYER && ((Player*)pVictim)->InBattleGround())
{
Player* killed = ((Player*)pVictim);
if (BattleGround* bg = killed->GetBattleGround())
if (player_tap)
bg->HandleKillPlayer(killed, player_tap);
}
else if (pVictim->GetTypeId() == TYPEID_UNIT)
{
if (player_tap)
if (pVictim->GetTypeId() == TYPEID_PLAYER)
{
Player* killed = (Player*)pVictim;
if (killed->InBattleGround())
{
if (BattleGround* bg = killed->GetBattleGround())
bg->HandleKillPlayer(killed, player_tap);
}
else if (pVictim != this)
{
// selfkills are not handled in outdoor pvp scripts
if (OutdoorPvP* outdoorPvP = sOutdoorPvPMgr.GetScript(player_tap->GetCachedZoneId()))
outdoorPvP->HandlePlayerKill(player_tap, killed);
}
}
else if (pVictim->GetTypeId() == TYPEID_UNIT)
{
if (BattleGround* bg = player_tap->GetBattleGround())
bg->HandleKillUnit((Creature*)pVictim, player_tap);
}
}
}
else // if (health <= damage)