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

Add call-on-services-ready attribute for service methods, and fix scene nullability (#900)

Browse source
This commit is contained in:
kizer 2022-06-27 01:49:34 +09:00 • committed by GitHub
parent 5809accf5d
commit 3369f569fb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
52 changed files with 274 additions and 273 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -15,7 +15,7 @@ namespace Dalamud.Game.Network
[PluginInterface]
[InterfaceVersion("1.0")]
[ServiceManager.BlockingEarlyLoadedService]
public sealed class GameNetwork : IDisposable
public sealed class GameNetwork : IDisposable, IServiceType
{
private readonly GameNetworkAddressResolver address;
private readonly Hook<ProcessZonePacketDownDelegate> processZonePacketDownHook;
@ -59,15 +59,6 @@ namespace Dalamud.Game.Network
/// </summary>
public event OnNetworkMessageDelegate NetworkMessage;
/// <summary>
/// Enable this module.
/// </summary>
public void Enable()
{
this.processZonePacketDownHook.Enable();
this.processZonePacketUpHook.Enable();
}
/// <summary>
/// Dispose of managed and unmanaged resources.
/// </summary>
@ -98,6 +89,13 @@ namespace Dalamud.Game.Network
}
}
[ServiceManager.CallWhenServicesReady]
private void ContinueConstruction()
{
this.processZonePacketDownHook.Enable();
this.processZonePacketUpHook.Enable();
}
private void ProcessZonePacketDownDetour(IntPtr a, uint targetId, IntPtr dataPtr)
{
this.baseAddress = a;