From 17971acddb203bfc3a47498a2dc3c80f7a839d3f Mon Sep 17 00:00:00 2001 From: Machiavelli Date: Tue, 25 Jan 2011 08:04:47 +0100 Subject: Core/Players: Implement generic SendClearFocus instead of magic SMSG_BREAK_PACKET randomly in the middle of code. Also preallocate correct size for packed guid. --- src/server/game/Entities/Player/Player.cpp | 7 +++++++ src/server/game/Entities/Player/Player.h | 1 + src/server/game/Entities/Unit/Unit.cpp | 4 +--- 3 files changed, 9 insertions(+), 3 deletions(-) (limited to 'src/server') diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 65698fa019b..19fab4c41f2 100755 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -24531,3 +24531,10 @@ void Player::_SaveInstanceTimeRestrictions(SQLTransaction& trans) trans->Append(stmt); } } + +void Player::SendClearFocus(Unit* target) +{ + WorldPacket data(SMSG_BREAK_TARGET, target->GetPackGUID().size()); + data.append(target->GetPackGUID()); + GetSession()->SendPacket(&data); +} \ No newline at end of file diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index 11e7cbd3e98..a4f5b42286c 100755 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -2281,6 +2281,7 @@ class Player : public Unit, public GridObject void SendCinematicStart(uint32 CinematicSequenceId); void SendMovieStart(uint32 MovieId); + void SendClearFocus(Unit* target); /*********************************************************/ /*** INSTANCE SYSTEM ***/ diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index bef31f7de14..5f3a6e2a73f 100755 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -16411,9 +16411,7 @@ void Unit::EnterVehicle(Vehicle *vehicle, int8 seatId, AuraApplication const * a WorldPacket data(SMSG_ON_CANCEL_EXPECTED_RIDE_VEHICLE_AURA, 0); thisPlr->GetSession()->SendPacket(&data); - data.Initialize(SMSG_BREAK_TARGET, 7); - data.append(vehicle->GetBase()->GetPackGUID()); - thisPlr->GetSession()->SendPacket(&data); + thisPlr->SendClearFocus(vehicle->GetBase()); } SetControlled(true, UNIT_STAT_ROOT); -- cgit v1.2.3