From ccc293931d00a192f9ff2a1302bd9cb51ad6778f Mon Sep 17 00:00:00 2001 From: Shauren Date: Thu, 1 Jan 2015 20:38:19 +0100 Subject: Core/PacketIO: Removed SMSG_DESTROY_OBJECT from opcodes enum --- src/server/game/Entities/Object/Object.cpp | 15 +-------------- src/server/game/Entities/Object/Object.h | 2 +- 2 files changed, 2 insertions(+), 15 deletions(-) (limited to 'src/server/game/Entities/Object') diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index 42f60774af3..a36e3c34afd 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -284,23 +284,10 @@ void Object::BuildOutOfRangeUpdateBlock(UpdateData* data) const data->AddOutOfRangeGUID(GetGUID()); } -void Object::DestroyForPlayer(Player* target, bool onDeath) const +void Object::DestroyForPlayer(Player* target) const { ASSERT(target); - if (isType(TYPEMASK_UNIT) || isType(TYPEMASK_PLAYER)) - { - if (Battleground* bg = target->GetBattleground()) - { - if (bg->isArena()) - { - WorldPacket data(SMSG_ARENA_UNIT_DESTROYED, 8); - data << GetGUID(); - target->GetSession()->SendPacket(&data); - } - } - } - UpdateData updateData(target->GetMapId()); BuildOutOfRangeUpdateBlock(&updateData); WorldPacket packet; diff --git a/src/server/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h index a96427c0dda..a1d68c2b80b 100644 --- a/src/server/game/Entities/Object/Object.h +++ b/src/server/game/Entities/Object/Object.h @@ -116,7 +116,7 @@ class Object void BuildValuesUpdateBlockForPlayer(UpdateData* data, Player* target) const; void BuildOutOfRangeUpdateBlock(UpdateData* data) const; - virtual void DestroyForPlayer(Player* target, bool onDeath = false) const; + virtual void DestroyForPlayer(Player* target) const; int32 GetInt32Value(uint16 index) const; uint32 GetUInt32Value(uint16 index) const; -- cgit v1.2.3