Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts: src/server/game/Entities/Player/Player.cpp src/server/game/Handlers/BattleGroundHandler.cpp src/server/game/Server/WorldSession.h src/server/game/Spells/Spell.cpp src/tools/vmap4_extractor/mpq_libmpq04.h
This commit is contained in:
commit
354e46d9e0
37 files changed
+6082
-14
No files matched your search
@@ -57,6 +57,8 @@
|
||||
#include "MoveSpline.h"
|
||||
#include "ConditionMgr.h"
|
||||
#include "UpdateFieldFlags.h"
|
||||
#include "Battlefield.h"
|
||||
#include "BattlefieldMgr.h"
|
||||
|
||||
#include <math.h>
|
||||
|
||||
@@ -14856,9 +14858,14 @@ 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 (victim->GetTypeId() == TYPEID_PLAYER)
|
||||
// if (OutdoorPvP* pvp = victim->ToPlayer()->GetOutdoorPvP())
|
||||
// pvp->HandlePlayerActivityChangedpVictim->ToPlayer();
|
||||
|
||||
Reference in new issue
Block a user