ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-15 05:04:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #531 from goatcorp/networkMessage

Browse source
This commit is contained in:
goaaats 2021-09-05 03:55:09 +02:00 • committed by GitHub
commit b78720a1b9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Dalamud/Game/Network/GameNetwork.cs
View file

@ -58,7 +58,7 @@ namespace Dalamud.Game.Network
/// <summary> /// <summary>
/// Event that is called when a network message is sent/received. /// Event that is called when a network message is sent/received.
/// </summary> /// </summary>
public event OnNetworkMessageDelegate OnNetworkMessage; public event OnNetworkMessageDelegate NetworkMessage;
/// <summary> /// <summary>
/// Enable this module. /// Enable this module.
@ -109,7 +109,7 @@ namespace Dalamud.Game.Network
try try
{ {
// Call events // 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); this.processZonePacketDownHook.Original(a, targetId, dataPtr + 0x10);
} }
@ -139,7 +139,7 @@ namespace Dalamud.Game.Network
{ {
// Call events // Call events
// TODO: Implement actor IDs // 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) catch (Exception ex)
{ {

2
Dalamud/Game/Network/Internal/NetworkHandlers.cs
View file

@ -37,7 +37,7 @@ namespace Dalamud.Game.Network.Internal
this.uploader = new UniversalisMarketBoardUploader(); this.uploader = new UniversalisMarketBoardUploader();
Service<GameNetwork>.Get().OnNetworkMessage += this.OnNetworkMessage; Service<GameNetwork>.Get().NetworkMessage += this.OnNetworkMessage;
} }
/// <summary> /// <summary>