This reverts commit f580cddc09.
This commit is contained in:
@@ -54,7 +54,7 @@
|
||||
#include "Vehicle.h"
|
||||
#include "Transport.h"
|
||||
#include "InstanceScript.h"
|
||||
#include "BattlefieldMgr.h"
|
||||
|
||||
#include <math.h>
|
||||
|
||||
float baseMoveSpeed[MAX_MOVE_TYPE] =
|
||||
@@ -15487,14 +15487,9 @@ void Unit::Kill(Unit* victim, bool durabilityLoss)
|
||||
// outdoor pvp things, do these after setting the death state, else the player activity notify won't work... doh...
|
||||
// handle player kill only if not suicide (spirit of redemption for example)
|
||||
if (player && this != victim)
|
||||
{
|
||||
if (OutdoorPvP* pvp = player->GetOutdoorPvP())
|
||||
pvp->HandleKill(player, victim);
|
||||
|
||||
if (Battlefield* bf = sBattlefieldMgr.GetBattlefieldToZoneId(player->GetZoneId()))
|
||||
bf->HandleKill(player, victim);
|
||||
}
|
||||
|
||||
//if (pVictim->GetTypeId() == TYPEID_PLAYER)
|
||||
// if (OutdoorPvP* pvp = pVictim->ToPlayer()->GetOutdoorPvP())
|
||||
// pvp->HandlePlayerActivityChangedpVictim->ToPlayer();
|
||||
|
||||
Reference in New Issue
Block a user