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 /// /// Event that is called when a network message is sent/received. /// - public event OnNetworkMessageDelegate OnNetworkMessage; + public event OnNetworkMessageDelegate NetworkMessage; /// /// 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) { 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.Get().OnNetworkMessage += this.OnNetworkMessage; + Service.Get().NetworkMessage += this.OnNetworkMessage; } ///