From 94b78ebc8b0eb09409d0db36bebfde85a1644fe8 Mon Sep 17 00:00:00 2001 From: Shauren Date: Sun, 24 Mar 2024 14:39:29 +0100 Subject: Core/Players: Slightly improve neutral player faction support --- src/server/game/Entities/Creature/Creature.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src/server/game/Entities/Creature') diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index 2ceaa8ce7b1..18343779978 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -2813,10 +2813,15 @@ void Creature::LoadCreaturesSparringHealth(bool force /*= false*/) /// Send a message to LocalDefense channel for players opposition team in the zone void Creature::SendZoneUnderAttackMessage(Player* attacker) { - uint32 enemy_team = attacker->GetTeam(); WorldPackets::Misc::ZoneUnderAttack packet; packet.AreaID = GetAreaId(); - sWorld->SendGlobalMessage(packet.Write(), nullptr, (enemy_team == ALLIANCE ? HORDE : ALLIANCE)); + packet.Write(); + + Team enemyTeam = attacker->GetTeam(); + if (enemyTeam != ALLIANCE) + sWorld->SendGlobalMessage(packet.GetRawPacket(), nullptr, ALLIANCE); + if (enemyTeam != HORDE) + sWorld->SendGlobalMessage(packet.GetRawPacket(), nullptr, HORDE); } void Creature::SetCanMelee(bool canMelee, bool fleeFromMelee /*= false*/) -- cgit v1.2.3