From 6f4c6514a4be0beb078c8aca5ab8b4fe600515ce Mon Sep 17 00:00:00 2001 From: MidoriKami <9083275+MidoriKami@users.noreply.github.com> Date: Tue, 24 Jan 2023 16:54:00 -0800 Subject: [PATCH] Use EarlyLoadedService instead of BlockingEarlyLoadedService --- Dalamud/Game/DutyState/DutyState.cs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Dalamud/Game/DutyState/DutyState.cs b/Dalamud/Game/DutyState/DutyState.cs index eb7063d9a..336daf2bc 100644 --- a/Dalamud/Game/DutyState/DutyState.cs +++ b/Dalamud/Game/DutyState/DutyState.cs @@ -14,7 +14,7 @@ namespace Dalamud.Game.DutyState; /// [PluginInterface] [InterfaceVersion("1.0")] -[ServiceManager.BlockingEarlyLoadedService] +[ServiceManager.EarlyLoadedService] public unsafe class DutyState : IDisposable, IServiceType { private readonly DutyStateAddressResolver address; @@ -104,25 +104,25 @@ public unsafe class DutyState : IDisposable, IServiceType switch (type) { // Duty Commenced - case 0x40000001: + case 0x4000_0001: this.IsDutyStarted = true; this.DutyStarted.InvokeSafely(this, this.clientState.TerritoryType); break; // Party Wipe - case 0x40000005: + case 0x4000_0005: this.IsDutyStarted = false; this.DutyWiped.InvokeSafely(this, this.clientState.TerritoryType); break; // Duty Recommence - case 0x40000006: + case 0x4000_0006: this.IsDutyStarted = true; this.DutyRecommenced.InvokeSafely(this, this.clientState.TerritoryType); break; // Duty Completed - case 0x40000003: + case 0x4000_0003: this.IsDutyStarted = false; this.CompletedThisTerritory = true; this.DutyCompleted.InvokeSafely(this, this.clientState.TerritoryType); @@ -145,9 +145,9 @@ public unsafe class DutyState : IDisposable, IServiceType /// /// Fallback event handler in the case that we missed the duty started event. - /// Joining a duty in progress, or disconnecting and reconnecting will cause the player to miss the event + /// Joining a duty in progress, or disconnecting and reconnecting will cause the player to miss the event. /// - /// Framework reference + /// Framework reference. private void FrameworkOnUpdateEvent(Framework framework1) { // If the duty hasn't been started, and has not been completed yet this territory