From b5742a89985c2ea5b12fc887965aa9e31791be14 Mon Sep 17 00:00:00 2001
From: Raymond <daemitus@gmail.com>
Date: Fri, 3 Sep 2021 23:15:03 -0400
Subject: [PATCH 1/2] Rename OnNetworkMessage

---
 Dalamud/Game/Network/GameNetwork.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dalamud/Game/Network/GameNetwork.cs b/Dalamud/Game/Network/GameNetwork.cs
index d75865d50..e4feac4d0 100644
--- a/Dalamud/Game/Network/GameNetwork.cs
+++ b/Dalamud/Game/Network/GameNetwork.cs
@@ -58,7 +58,7 @@ namespace Dalamud.Game.Network
         /// <summary>
         /// Event that is called when a network message is sent/received.
         /// </summary>
-        public event OnNetworkMessageDelegate OnNetworkMessage;
+        public event OnNetworkMessageDelegate NetworkMessage;
 
         /// <summary>
         /// Enable this module.
@@ -109,7 +109,7 @@ namespace Dalamud.Game.Network
             try
             {
                 // Call events
-                this.OnNetworkMessage?.Invoke(dataPtr + 0x20, (ushort)Marshal.ReadInt16(dataPtr, 0x12), 0, targetId, NetworkMessageDirection.ZoneDown);
+                this.NetworkMessage?.Invoke(dataPtr + 0x20, (ushort)Marshal.ReadInt16(dataPtr, 0x12), 0, targetId, NetworkMessageDirection.ZoneDown);
 
                 this.processZonePacketDownHook.Original(a, targetId, dataPtr + 0x10);
             }
@@ -139,7 +139,7 @@ namespace Dalamud.Game.Network
             {
                 // Call events
                 // TODO: Implement actor IDs
-                this.OnNetworkMessage?.Invoke(dataPtr + 0x20, (ushort)Marshal.ReadInt16(dataPtr), 0x0, 0x0, NetworkMessageDirection.ZoneUp);
+                this.NetworkMessage?.Invoke(dataPtr + 0x20, (ushort)Marshal.ReadInt16(dataPtr), 0x0, 0x0, NetworkMessageDirection.ZoneUp);
             }
             catch (Exception ex)
             {

From cd314529ae223de90cc083fbb09abc27aee18ca7 Mon Sep 17 00:00:00 2001
From: Raymond <daemitus@gmail.com>
Date: Fri, 3 Sep 2021 23:20:49 -0400
Subject: [PATCH 2/2] Update all the places

---
 Dalamud/Game/Network/Internal/NetworkHandlers.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dalamud/Game/Network/Internal/NetworkHandlers.cs b/Dalamud/Game/Network/Internal/NetworkHandlers.cs
index c27fd2a97..586c602f4 100644
--- a/Dalamud/Game/Network/Internal/NetworkHandlers.cs
+++ b/Dalamud/Game/Network/Internal/NetworkHandlers.cs
@@ -37,7 +37,7 @@ namespace Dalamud.Game.Network.Internal
 
             this.uploader = new UniversalisMarketBoardUploader();
 
-            Service<GameNetwork>.Get().OnNetworkMessage += this.OnNetworkMessage;
+            Service<GameNetwork>.Get().NetworkMessage += this.OnNetworkMessage;
         }
 
         /// <summary>