From 301014f06f613641bbd8337cda309b3204459a38 Mon Sep 17 00:00:00 2001
From: MagicBot <MagicBot@magicbane.com>
Date: Fri, 29 Mar 2024 07:54:00 -0400
Subject: [PATCH] Handler created for AbstractChatMsg

---
 src/engine/net/client/ClientMessagePump.java | 20 +-------------------
 src/engine/net/client/Protocol.java          |  4 ++--
 2 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/src/engine/net/client/ClientMessagePump.java b/src/engine/net/client/ClientMessagePump.java
index 51565443..0a094478 100644
--- a/src/engine/net/client/ClientMessagePump.java
+++ b/src/engine/net/client/ClientMessagePump.java
@@ -68,25 +68,7 @@ public class ClientMessagePump implements NetMsgHandler {
             protocolMsg = msg.getProtocolMsg();
 
             switch (protocolMsg) {
-                /*
-                 * Chat
-                 */
-
-                // Simplify by fall through. Route in ChatManager
-                case CHATSAY:
-                case CHATSHOUT:
-                case CHATTELL:
-                case CHATGUILD:
-                case CHATGROUP:
-                case CHATPVP:
-                case CHATIC:
-                case CHATCITY:
-                case CHATINFO:
-                case SYSTEMBROADCASTCHANNEL:
-                case CHATCSR:
-                case SYSTEMCHANNEL:
-                case GLOBALCHANNELMESSAGE:
-                case LEADERCHANNELMESSAGE:
+
                 case READYTOENTER:
                     break;
                 case OPENVAULT:
diff --git a/src/engine/net/client/Protocol.java b/src/engine/net/client/Protocol.java
index 95255aba..c94ba080 100644
--- a/src/engine/net/client/Protocol.java
+++ b/src/engine/net/client/Protocol.java
@@ -98,7 +98,7 @@ public enum Protocol {
     FRIENDDECLINE(0xF08FC279, DeclineFriendMsg.class, FriendDeclineHandler.class),
     FURNITURE(0xCE7FA503, FurnitureMsg.class, FurnitureHandler.class),
     GAMESERVERIPRESPONSE(0x6C95CF87, GameServerIPResponseMsg.class, null), // Game Server IP Response
-    GLOBALCHANNELMESSAGE(0x2bf03fd2, null, null),
+    GLOBALCHANNELMESSAGE(0x2bf03fd2, ChatGlobalMsg.class, AbstractChatMsgHandler.class),
     GOLDFROMVAULT(0x011D0123, GoldFromVaultMsg.class, GoldFromVaultMsgHandler.class), // Transfer Gold from Vault to Inventory
     GOLDTOVAULT(0x3ABAEE49, GoldToVaultMsg.class, GoldToVaultMsgHandler.class), // Transfer Gold from Inventory to Vault
     GROUPDISBAND(0xE2B85AA4, DisbandGroupMsg.class, DisbandGroupHandler.class), //Disband Group
@@ -125,7 +125,7 @@ public enum Protocol {
     JOINGUILD(0xF0C5F2FF, AcceptInviteToGuildMsg.class, AcceptInviteToGuildHandler.class), // Accept guild invite
     KEEPALIVESERVERCLIENT(0x49EE129C, KeepAliveServerClientMsg.class, KeepAliveServerClientHandler.class), // Keep Alive
     LEADERBOARD(0x6F0C1386, LeaderboardMessage.class, null),
-    LEADERCHANNELMESSAGE(0x17b306f9, ChatGlobalMsg.class, null),
+    LEADERCHANNELMESSAGE(0x17b306f9, ChatGlobalMsg.class, AbstractChatMsgHandler.class),
     LEAVEGROUP(0xD8037303, LeaveGroupMsg.class, LeaveGroupHandler.class), //Leave Group
     LEAVEGUILD(0x1801EA32, LeaveGuildMsg.class, LeaveGuildHandler.class), // Leave Guild
     LEAVEREQUEST(0xC79D775C, LeaveWorldMsg.class, LeaveWorldMsgHandler.class), //Client Request Leave World