diff --git a/Dalamud/Game/Internal/Framework.cs b/Dalamud/Game/Internal/Framework.cs index 78250a17b..e65ead3a0 100644 --- a/Dalamud/Game/Internal/Framework.cs +++ b/Dalamud/Game/Internal/Framework.cs @@ -65,7 +65,7 @@ namespace Dalamud.Game.Internal { Gui = new GameGui(Address.GuiManager, scanner, dalamud); - Network = new GameNetwork(dalamud, scanner); + Network = new GameNetwork(scanner); //Resource = new ResourceManager(dalamud, scanner); } diff --git a/Dalamud/Game/Internal/Network/GameNetwork.cs b/Dalamud/Game/Internal/Network/GameNetwork.cs index 384d80315..505d7ab73 100644 --- a/Dalamud/Game/Internal/Network/GameNetwork.cs +++ b/Dalamud/Game/Internal/Network/GameNetwork.cs @@ -23,11 +23,6 @@ namespace Dalamud.Game.Internal.Network { private GameNetworkAddressResolver Address { get; } private IntPtr baseAddress; - public delegate void OnZonePacketDelegate(IntPtr dataPtr); - - [Obsolete("Please use OnNetworkMessage instead. For modifications, it will take precedence.")] - public OnZonePacketDelegate OnZonePacket; - public delegate void OnNetworkMessageDelegate(IntPtr dataPtr, NetworkMessageDirection direction); /// @@ -73,7 +68,6 @@ namespace Dalamud.Game.Internal.Network { try { // Call events - this.OnZonePacket?.Invoke(dataPtr); this.OnNetworkMessage?.Invoke(dataPtr, NetworkMessageDirection.ZoneDown); this.processZonePacketDownHook.Original(a, b, dataPtr); diff --git a/Dalamud/Game/Network/NetworkHandlers.cs b/Dalamud/Game/Network/NetworkHandlers.cs index 7f33290c6..f22b8745f 100644 --- a/Dalamud/Game/Network/NetworkHandlers.cs +++ b/Dalamud/Game/Network/NetworkHandlers.cs @@ -5,6 +5,7 @@ using System.Linq; using System.Runtime.InteropServices; using System.Threading.Tasks; using Dalamud.Data.TransientSheet; +using Dalamud.Game.Internal.Network; using Dalamud.Game.Network.MarketBoardUploaders; using Dalamud.Game.Network.Structures; using Dalamud.Game.Network.Universalis.MarketBoardUploaders; @@ -32,11 +33,14 @@ namespace Dalamud.Game.Network { this.uploader = new UniversalisMarketBoardUploader(dalamud); - dalamud.Framework.Network.OnZonePacket += OnZonePacket; + dalamud.Framework.Network.OnNetworkMessage += OnNetworkMessage; } - private void OnZonePacket(IntPtr dataPtr) { + private void OnNetworkMessage(IntPtr dataPtr, NetworkMessageDirection direction) { + if (direction != NetworkMessageDirection.ZoneDown) + return; + if (!this.dalamud.Data.IsDataReady) return;