From 9214e175772b29d7cdafbc3f1e76e6914a256fd3 Mon Sep 17 00:00:00 2001 From: goat <16760685+goaaats@users.noreply.github.com> Date: Wed, 11 Aug 2021 02:38:39 +0200 Subject: [PATCH] refactor: OnLogin, OnLogout => Login, Logout --- Dalamud/Game/ClientState/ClientState.cs | 8 ++++---- .../Windows/SelfTest/AgingSteps/LoginEventAgingStep.cs | 6 +++--- .../Windows/SelfTest/AgingSteps/LogoutEventAgingStep.cs | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Dalamud/Game/ClientState/ClientState.cs b/Dalamud/Game/ClientState/ClientState.cs index 4a82b96d5..acfb704a5 100644 --- a/Dalamud/Game/ClientState/ClientState.cs +++ b/Dalamud/Game/ClientState/ClientState.cs @@ -90,12 +90,12 @@ namespace Dalamud.Game.ClientState /// /// Event that fires when a character is logging in. /// - public event EventHandler OnLogin; + public event EventHandler Login; /// /// Event that fires when a character is logging out. /// - public event EventHandler OnLogout; + public event EventHandler Logout; /// /// Event that gets fired when a duty is ready. @@ -216,7 +216,7 @@ namespace Dalamud.Game.ClientState Log.Debug("Is login"); this.lastConditionNone = false; this.IsLoggedIn = true; - this.OnLogin?.Invoke(this, null); + this.Login?.Invoke(this, null); } if (!this.Condition.Any() && this.lastConditionNone == false) @@ -224,7 +224,7 @@ namespace Dalamud.Game.ClientState Log.Debug("Is logout"); this.lastConditionNone = true; this.IsLoggedIn = false; - this.OnLogout?.Invoke(this, null); + this.Logout?.Invoke(this, null); } } } diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/LoginEventAgingStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/LoginEventAgingStep.cs index 27297083c..648b42e63 100644 --- a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/LoginEventAgingStep.cs +++ b/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/LoginEventAgingStep.cs @@ -22,13 +22,13 @@ namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps if (!this.subscribed) { - dalamud.ClientState.OnLogin += this.ClientStateOnOnLogin; + dalamud.ClientState.Login += this.ClientStateOnOnLogin; this.subscribed = true; } if (this.hasPassed) { - dalamud.ClientState.OnLogin -= this.ClientStateOnOnLogin; + dalamud.ClientState.Login -= this.ClientStateOnOnLogin; this.subscribed = false; return SelfTestStepResult.Pass; } @@ -41,7 +41,7 @@ namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps { if (this.subscribed) { - dalamud.ClientState.OnLogin -= this.ClientStateOnOnLogin; + dalamud.ClientState.Login -= this.ClientStateOnOnLogin; this.subscribed = false; } } diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/LogoutEventAgingStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/LogoutEventAgingStep.cs index 0356c0dd2..6b6ce78fe 100644 --- a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/LogoutEventAgingStep.cs +++ b/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/LogoutEventAgingStep.cs @@ -22,13 +22,13 @@ namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps if (!this.subscribed) { - dalamud.ClientState.OnLogout += this.ClientStateOnOnLogout; + dalamud.ClientState.Logout += this.ClientStateOnOnLogout; this.subscribed = true; } if (this.hasPassed) { - dalamud.ClientState.OnLogout -= this.ClientStateOnOnLogout; + dalamud.ClientState.Logout -= this.ClientStateOnOnLogout; this.subscribed = false; return SelfTestStepResult.Pass; } @@ -41,7 +41,7 @@ namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps { if (this.subscribed) { - dalamud.ClientState.OnLogout -= this.ClientStateOnOnLogout; + dalamud.ClientState.Logout -= this.ClientStateOnOnLogout; this.subscribed = false; } }