From 2afcbf6bd6e31ca83d905409ed9a6b2c65c2a435 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Thu, 2 Jan 2020 00:37:44 +0000
Subject: [PATCH] Show castle icon on chat.

---
 .../network/serverpackets/CreatureSay.java          | 13 +++++++++++--
 .../network/serverpackets/CreatureSay.java          | 13 +++++++++++--
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java
index 1334f7bb55..5fb5c1223b 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java
@@ -198,9 +198,9 @@ public class CreatureSay implements IClientOutgoingPacket
 		final PlayerInstance player = World.getInstance().getPlayer(_objectId);
 		if (player != null)
 		{
-			if (((_chatType == ChatType.CLAN) || (_chatType == ChatType.ALLIANCE)) && (player.getClan() != null))
+			if ((player.getClan() != null) && ((_chatType == ChatType.CLAN) || (_chatType == ChatType.ALLIANCE)))
 			{
-				packet.writeC(player.getClan().getCastleId());
+				packet.writeC(0); // unknown clan byte
 			}
 			
 			final int rank = RankManager.getInstance().getPlayerGlobalRank(player);
@@ -220,6 +220,15 @@ public class CreatureSay implements IClientOutgoingPacket
 			{
 				packet.writeC(3);
 			}
+			
+			if (player.getClan() != null)
+			{
+				packet.writeC(player.getClan().getCastleId());
+			}
+			else
+			{
+				packet.writeC(0);
+			}
 		}
 		else
 		{
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java
index 1334f7bb55..5fb5c1223b 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java
@@ -198,9 +198,9 @@ public class CreatureSay implements IClientOutgoingPacket
 		final PlayerInstance player = World.getInstance().getPlayer(_objectId);
 		if (player != null)
 		{
-			if (((_chatType == ChatType.CLAN) || (_chatType == ChatType.ALLIANCE)) && (player.getClan() != null))
+			if ((player.getClan() != null) && ((_chatType == ChatType.CLAN) || (_chatType == ChatType.ALLIANCE)))
 			{
-				packet.writeC(player.getClan().getCastleId());
+				packet.writeC(0); // unknown clan byte
 			}
 			
 			final int rank = RankManager.getInstance().getPlayerGlobalRank(player);
@@ -220,6 +220,15 @@ public class CreatureSay implements IClientOutgoingPacket
 			{
 				packet.writeC(3);
 			}
+			
+			if (player.getClan() != null)
+			{
+				packet.writeC(player.getClan().getCastleId());
+			}
+			else
+			{
+				packet.writeC(0);
+			}
 		}
 		else
 		{