Fix GM Chat Flag

coolzoom · May 25, 2022 · 66e0458 · 66e0458
1 parent d94a041
commit 66e0458
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/HermesProxy/VersionChecker.cs b/HermesProxy/VersionChecker.cs
@@ -246,6 +246,14 @@ public static uint ConvertSpellCastResult(uint result)
                 return (uint)Enum.Parse(typeof(SpellCastResultClassic), ((SpellCastResultVanilla)result).ToString());
         }
 
+        public static ChatFlags ConvertChatFlags(byte rawOldChatFlags)
+        {
+            ChatFlags result = (ChatFlags) rawOldChatFlags;
+            if (RemovedInVersion(ClientVersionBuild.V2_0_1_6180) && result.HasFlag(ChatFlags.AFK) && result.HasFlag(ChatFlags.DND))
+                return ChatFlags.GM; // In vanilla AFK | DND == GM
+            return result;
+        }
+
         public static QuestGiverStatusModern ConvertQuestGiverStatus(byte status)
         {
             if (AddedInVersion(ClientVersionBuild.V3_0_2_9056))

diff --git a/HermesProxy/World/Client/PacketHandlers/ChatHandler.cs b/HermesProxy/World/Client/PacketHandlers/ChatHandler.cs
@@ -200,7 +200,7 @@ void HandleServerChatMessageVanilla(WorldPacket packet)
 
             uint textLength = packet.ReadUInt32();
             string text = packet.ReadString(textLength);
-            ChatFlags chatFlags = (ChatFlags)packet.ReadUInt8();
+            ChatFlags chatFlags = LegacyVersion.ConvertChatFlags(packet.ReadUInt8());
 
             string addonPrefix = "";
             if (!ChatPkt.CheckAddonPrefix(GetSession().GameState.AddonPrefixes, ref language, ref text, ref addonPrefix))
@@ -310,7 +310,7 @@ void HandleServerChatMessageWotLK(WorldPacket packet)
 
             uint textLength = packet.ReadUInt32();
             string text = packet.ReadString(textLength);
-            ChatFlags chatFlags = (ChatFlags)packet.ReadUInt8();
+            ChatFlags chatFlags = LegacyVersion.ConvertChatFlags(packet.ReadUInt8());
 
             if (LegacyVersion.InVersion(ClientVersionBuild.V2_0_1_6180, ClientVersionBuild.V3_0_2_9056) &&
                 packet.GetUniversalOpcode(false) == Opcode.SMSG_GM_MESSAGECHAT)

diff --git a/HermesProxy/World/Enums/PlayerDefines.cs b/HermesProxy/World/Enums/PlayerDefines.cs
@@ -140,6 +140,7 @@ public enum RestState
         Normal = 0x02,
     };
 
+    [Flags]
     public enum ChatFlags
     {
         None = 0x00,
-Original file line number
+Diff line change
@@ Expand Up / @@ -140,6 +140,7 @@ public enum RestState @@
             Normal = 0x02,
         };
+        [Flags]
         public enum ChatFlags
         {
             None = 0x00,
@@ Expand Down @@