From 9b475fde60c4026307a5ba78fcfc763ccd39ed12 Mon Sep 17 00:00:00 2001
From: Nuno <ulukyn@gmail.com>
Date: Sat, 15 May 2021 14:57:10 +0200
Subject: [PATCH] Merge branch 'outpost_refactoring'

---
 ryzom/server/src/input_output_service/chat_manager.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/ryzom/server/src/input_output_service/chat_manager.cpp b/ryzom/server/src/input_output_service/chat_manager.cpp
index ea09de224..2ecebafbe 100644
--- a/ryzom/server/src/input_output_service/chat_manager.cpp
+++ b/ryzom/server/src/input_output_service/chat_manager.cpp
@@ -2028,7 +2028,7 @@ void CChatManager::sendChat( CChatGroup::TGroupType senderChatMode, const TDataS
 void CChatManager::sendFarChat(const string &name, const ucstring& ucstr, const string &chan)
 {
 	const TChanID *chanId = _ChanNames.getA(chan);
-	if (chanId || chan == "universe")
+	if (chanId || chan == "universe" || chan.substr(0, 6) == "guild:")
 	{
 
 		string usedlang = "";
@@ -2090,6 +2090,12 @@ void CChatManager::sendFarChat(const string &name, const ucstring& ucstr, const
 			TGroupId grpId = CEntityId(RYZOMID::chatGroup, 0);
 			farChatInGroup(grpId, 0, ucstr, ucstring("~")+ucstring(name));
 		}
+		else if (chan.substr(0, 6) == "guild:")
+		{
+			TGroupId groupId = CEntityId::Unknown;
+			groupId.fromString(chan.substr(6).c_str());
+			farChatInGroup(groupId, 0, ucstr, ucstring("~")+ucstring(name));
+		}
 		else
 		{