From afb2a1151c97e58031540cfe59e36604e332ecb6 Mon Sep 17 00:00:00 2001
From: Aqua Deus <95978183+aquadeus@users.noreply.github.com>
Date: Sat, 8 Nov 2025 21:39:32 +0100
Subject: Core/Garrison: Always send response to GetGarrisonInfo, even if no
 garrison exists (#31336)

---
 src/server/game/Handlers/GarrisonHandler.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/server/game/Handlers/GarrisonHandler.cpp')

diff --git a/src/server/game/Handlers/GarrisonHandler.cpp b/src/server/game/Handlers/GarrisonHandler.cpp
index ef725a3cd39..a0a044c5236 100644
--- a/src/server/game/Handlers/GarrisonHandler.cpp
+++ b/src/server/game/Handlers/GarrisonHandler.cpp
@@ -22,8 +22,13 @@
 
 void WorldSession::HandleGetGarrisonInfo(WorldPackets::Garrison::GetGarrisonInfo& /*getGarrisonInfo*/)
 {
+    WorldPackets::Garrison::GetGarrisonInfoResult garrisonInfo;
+    garrisonInfo.FactionIndex = Garrison::GetFaction(_player->GetTeam());
+
     if (Garrison* garrison = _player->GetGarrison())
-        garrison->SendInfo();
+        garrison->BuildInfoPacket(garrisonInfo.Garrisons.emplace_back());
+
+    SendPacket(garrisonInfo.Write());
 }
 
 void WorldSession::HandleGarrisonPurchaseBuilding(WorldPackets::Garrison::GarrisonPurchaseBuilding& garrisonPurchaseBuilding)
-- 
cgit v1.2.3