From f77768faad1668b73dee05e5ae62740a583cdfed Mon Sep 17 00:00:00 2001
From: Shauren <shauren.trinity@gmail.com>
Date: Mon, 3 Nov 2025 12:01:37 +0100
Subject: Core/Creatures: Fix battleground spirit guides on ffa pvp realms

Closes #31438
---
 src/server/game/Entities/Creature/Creature.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src')

diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp
index cf2ee4acc5b..7a91c578cdf 100644
--- a/src/server/game/Entities/Creature/Creature.cpp
+++ b/src/server/game/Entities/Creature/Creature.cpp
@@ -639,6 +639,13 @@ bool Creature::UpdateEntry(uint32 entry, CreatureData const* data /*= nullptr*/,
 
     m_stringIds[AsUnderlyingType(StringIdType::Template)] = &cInfo->StringId;
 
+    if (IsSpiritGuide() && sWorld->IsFFAPvPRealm())
+    {
+        // client will only send spirit guide query for units that can assist them
+        // for ffa pvp flagged players its only other ffa pvp flagged units
+        SetPvpFlag(UNIT_BYTE2_FLAG_FFA_PVP);
+    }
+
     return true;
 }
 
-- 
cgit v1.2.3