Merge pull request #454 from MUnique/dev/fix-playerstate-on-disconnect

Fixed player state when leaving the game.
MUnique · Aug 14, 2024 · a65f056 · a65f056
2 parents 869a157 + 6ff2c78
commit a65f056
Show file tree

Hide file tree

Showing 7 changed files with 78 additions and 50 deletions.
diff --git a/src/GameLogic/GameContext.cs b/src/GameLogic/GameContext.cs
@@ -439,7 +439,7 @@ private async void RecoverTimerElapsed(object? state)
         {
             await this.ForEachPlayerAsync(player =>
             {
-                if (player.SelectedCharacter != null && player.PlayerState.CurrentState == PlayerState.EnteredWorld)
+                if (player.SelectedCharacter != null && !player.PlayerState.CurrentState.IsDisconnectedOrFinished())
                 {
                     return player.RegenerateAsync();
                 }

diff --git a/src/GameLogic/Player.cs b/src/GameLogic/Player.cs
@@ -897,7 +897,7 @@ public async ValueTask WarpToAsync(ExitGate gate)
         this.PlaceAtGate(gate);
         this.CurrentMap = null; // Will be set again, when the client acknowledged the map change by F3 12 packet.
 
-        if (this.PlayerState.CurrentState != GameLogic.PlayerState.Disconnected)
+        if (!this.PlayerState.CurrentState.IsDisconnectedOrFinished())
         {
             await this.InvokeViewPlugInAsync<IMapChangePlugIn>(p => p.MapChangeAsync()).ConfigureAwait(false);
         }
@@ -1557,6 +1557,52 @@ public async ValueTask ResetPetBehaviorAsync()
         }
     }
 
+    /// <summary>
+    /// Removes the player from the game and saves its state.
+    /// </summary>
+    public async ValueTask RemoveFromGameAsync()
+    {
+        var moveToNextSafezone = false;
+        if (this._respawnAfterDeathCts is { IsCancellationRequested: false })
+        {
+            await this._respawnAfterDeathCts.CancelAsync().ConfigureAwait(false);
+            moveToNextSafezone = true;
+        }
+
+        if (this.CurrentMiniGame is { })
+        {
+            moveToNextSafezone = true;
+        }
+
+        if (this.DuelRoom is { })
+        {
+            moveToNextSafezone = true;
+        }
+
+        if (moveToNextSafezone)
+        {
+            await this.WarpToSafezoneAsync().ConfigureAwait(false);
+        }
+
+        await this.RemoveFromCurrentMapAsync().ConfigureAwait(false);
+        if (this.Party is { } party)
+        {
+            await party.KickMySelfAsync(this).ConfigureAwait(false);
+        }
+
+        await this.SetSelectedCharacterAsync(null).ConfigureAwait(false);
+        await this.MagicEffectList.ClearAllEffectsAsync().ConfigureAwait(false);
+
+        try
+        {
+            await this.PersistenceContext.SaveChangesAsync().ConfigureAwait(false);
+        }
+        catch (Exception ex)
+        {
+            this.Logger.LogError(ex, "Couldn't save when leaving the game. Player: {player}", this);
+        }
+    }
+
     /// <inheritdoc />
     protected override async ValueTask DisposeAsyncCore()
     {
@@ -1592,33 +1638,7 @@ protected override async ValueTask DisposeAsyncCore()
     /// </summary>
     protected virtual async ValueTask InternalDisconnectAsync()
     {
-        var moveToNextSafezone = false;
-        if (this._respawnAfterDeathCts is { IsCancellationRequested: false })
-        {
-            await this._respawnAfterDeathCts.CancelAsync().ConfigureAwait(false);
-            moveToNextSafezone = true;
-        }
-
-        if (this.CurrentMiniGame is { })
-        {
-            moveToNextSafezone = true;
-        }
-
-        if (this.DuelRoom is { })
-        {
-            moveToNextSafezone = true;
-        }
-
-        if (moveToNextSafezone)
-        {
-            await this.WarpToSafezoneAsync().ConfigureAwait(false);
-        }
-
-        await this.RemoveFromCurrentMapAsync().ConfigureAwait(false);
-        if (this.Party is { } party)
-        {
-            await party.KickMySelfAsync(this).ConfigureAwait(false);
-        }
+        await this.RemoveFromGameAsync().ConfigureAwait(false);
     }
 
     /// <summary>

diff --git a/src/GameLogic/PlayerActions/LogoutAction.cs b/src/GameLogic/PlayerActions/LogoutAction.cs
@@ -18,19 +18,7 @@ public class LogoutAction
     /// <param name="logoutType">Type of the logout.</param>
     public async ValueTask LogoutAsync(Player player, LogoutType logoutType)
     {
-        player.CurrentMap?.RemoveAsync(player);
-        player.Party?.KickMySelfAsync(player);
-        await player.SetSelectedCharacterAsync(null).ConfigureAwait(false);
-        await player.MagicEffectList.ClearAllEffectsAsync().ConfigureAwait(false);
-
-        try
-        {
-            await player.PersistenceContext.SaveChangesAsync().ConfigureAwait(false);
-        }
-        catch (Exception ex)
-        {
-            player.Logger.LogError(ex, "Couldn't Save at Disconnect. Player: {player}", player);
-        }
+        await player.RemoveFromGameAsync().ConfigureAwait(false);
 
         if (logoutType == LogoutType.CloseGame)
         {

diff --git a/src/GameLogic/PlayerActions/Trade/TradeAcceptAction.cs b/src/GameLogic/PlayerActions/Trade/TradeAcceptAction.cs
@@ -31,8 +31,18 @@ public async ValueTask HandleTradeAcceptAsync(ITrader tradeAccepter, bool accept
             }
             else
             {
-                await this.OpenTradeAsync(tradeAccepter).ConfigureAwait(false);
-                await this.OpenTradeAsync(tradePartner).ConfigureAwait(false);
+                try
+                {
+                    await this.OpenTradeAsync(tradeAccepter).ConfigureAwait(false);
+                    await this.OpenTradeAsync(tradePartner).ConfigureAwait(false);
+                }
+                catch (Exception ex)
+                {
+                    tradeAccepter.Logger.LogError(ex, "Error while opening a trade between {tradeAccepter} and {tradePartner}", tradeAccepter, tradePartner);
+                    await this.CancelTradeAsync(tradeAccepter).ConfigureAwait(false);
+                    await this.CancelTradeAsync(tradePartner).ConfigureAwait(false);
+                }
+
             }
         }
         else

diff --git a/src/GameLogic/PlayerState.cs b/src/GameLogic/PlayerState.cs
@@ -7,7 +7,7 @@ namespace MUnique.OpenMU.GameLogic;
 /// <summary>
 /// The states of a player, used by the <see cref="ITrader.PlayerState"/>.
 /// </summary>
-public class PlayerState
+public static class PlayerState
 {
     static PlayerState()
     {
@@ -80,6 +80,18 @@ static PlayerState()
     }
 
     /// <summary>
+    /// Determines whether the state is <see cref="Disconnected"/> or <see cref="Finished"/>.
+    /// </summary>
+    /// <param name="state">The state.</param>
+    /// <returns>
+    ///   <c>true</c> if the state is <see cref="Disconnected"/> or <see cref="Finished"/>; otherwise, <c>false</c>.
+    /// </returns>
+    public static bool IsDisconnectedOrFinished(this State state)
+    {
+        return state == Disconnected || state == Finished;
+    }
+
+     /// <summary>
     /// Gets the finished state. When this state is active, the player session was saved and the player object can be safely removed from the game.
     /// </summary>
     public static State Finished { get; } = new (new Guid("AB24C7C4-4F37-40ED-B874-0F6C7984C471"))

diff --git a/src/GameLogic/PlugIns/InvasionEvents/BaseInvasionPlugIn.cs b/src/GameLogic/PlugIns/InvasionEvents/BaseInvasionPlugIn.cs
@@ -192,8 +192,7 @@ protected bool IsPlayerOnMap(Player player, bool checkForCurrentMap = false)
         var state = this.GetStateByGameContext(player.GameContext);
 
         return player.CurrentMap is { } map
-            && player.PlayerState.CurrentState != PlayerState.Disconnected
-            && player.PlayerState.CurrentState != PlayerState.Finished
+            && !player.PlayerState.CurrentState.IsDisconnectedOrFinished()
             && (!checkForCurrentMap || map.MapId == state.MapId);
     }
 

diff --git a/src/GameLogic/PlugIns/PeriodicTasks/HappyHourPlugIn.cs b/src/GameLogic/PlugIns/PeriodicTasks/HappyHourPlugIn.cs
@@ -31,7 +31,7 @@ public async ValueTask PlayerStateChangedAsync(Player player, State previousStat
     {
         try
         {
-            if (currentState == PlayerState.Disconnected)
+            if (currentState.IsDisconnectedOrFinished())
             {
                 player.Attributes?.RemoveElement(this._happyHourExtraMultiplier, Stats.ExperienceRate);
                 player.Attributes?.RemoveElement(this._happyHourExtraMultiplier, Stats.MasterExperienceRate);
@@ -100,8 +100,7 @@ protected override ValueTask OnFinishedAsync(PeriodicTaskGameServerState state)
     protected bool IsPlayerOnMap(Player player)
     {
         return player.CurrentMap is not null
-            && player.PlayerState.CurrentState != PlayerState.Disconnected
-            && player.PlayerState.CurrentState != PlayerState.Finished;
+               && !player.PlayerState.CurrentState.IsDisconnectedOrFinished();
     }
 
     /// <summary>