Changed some plugins to be async

They will needed to be async for some duel updates which send messages.
MUnique · Jul 7, 2024 · 9816233 · 9816233
1 parent 28fadb3
commit 9816233
Show file tree

Hide file tree

Showing 11 changed files with 53 additions and 40 deletions.
diff --git a/src/GameLogic/GameContext.cs b/src/GameLogic/GameContext.cs
@@ -187,15 +187,19 @@ public async ValueTask<IEnumerable<GameMap>> GetMapsAsync()
             }
 
             this._mapList.Add(mapId, createdMap);
-            createdMap.ObjectAdded += args =>
+            createdMap.ObjectAdded += async args =>
             {
-                this.PlugInManager.GetPlugInPoint<IObjectAddedToMapPlugIn>()?.ObjectAddedToMap(args.Map, args.Object);
-                return ValueTask.CompletedTask;
+                if (this.PlugInManager.GetPlugInPoint<IObjectAddedToMapPlugIn>() is { } plugInPoint)
+                {
+                    await plugInPoint.ObjectAddedToMapAsync(args.Map, args.Object).ConfigureAwait(false);
+                }
             };
-            createdMap.ObjectRemoved += args =>
+            createdMap.ObjectRemoved += async args =>
             {
-                this.PlugInManager.GetPlugInPoint<IObjectRemovedFromMapPlugIn>()?.ObjectRemovedFromMap(args.Map, args.Object);
-                return ValueTask.CompletedTask;
+                if (this.PlugInManager.GetPlugInPoint<IObjectRemovedFromMapPlugIn>() is { } plugInPoint)
+                {
+                    await plugInPoint.ObjectRemovedFromMapAsync(args.Map, args.Object).ConfigureAwait(false);
+                }
             };
         }
 

diff --git a/src/GameLogic/MiniGames/MiniGameContext.cs b/src/GameLogic/MiniGames/MiniGameContext.cs
@@ -360,7 +360,11 @@ protected virtual void OnItemDroppedOnMap(DroppedItem item)
     /// <param name="args">The event parameters.</param>
     protected virtual async ValueTask OnObjectAddedToMapAsync((GameMap Map, ILocateable Object) args)
     {
-        this._gameContext.PlugInManager.GetPlugInPoint<IObjectAddedToMapPlugIn>()?.ObjectAddedToMap(args.Map, args.Object);
+        if (this._gameContext.PlugInManager.GetPlugInPoint<IObjectAddedToMapPlugIn>() is { } plugInPoint)
+        {
+            await plugInPoint.ObjectAddedToMapAsync(args.Map, args.Object).ConfigureAwait(false);
+        }
+
         if (args.Object is Monster monster)
         {
             monster.Died += this.OnMonsterDied;
@@ -390,7 +394,11 @@ protected virtual async ValueTask OnObjectRemovedFromMapAsync((GameMap Map, ILoc
     {
         try
         {
-            this._gameContext.PlugInManager.GetPlugInPoint<IObjectRemovedFromMapPlugIn>()?.ObjectRemovedFromMap(args.Map, args.Object);
+            if (this._gameContext.PlugInManager.GetPlugInPoint<IObjectRemovedFromMapPlugIn>() is { } plugInPoint)
+            {
+                await plugInPoint.ObjectRemovedFromMapAsync(args.Map, args.Object).ConfigureAwait(false);
+            }
+
             if (args.Object is not Player player)
             {
                 return;

diff --git a/src/GameLogic/NPC/AttackableNpcBase.cs b/src/GameLogic/NPC/AttackableNpcBase.cs
@@ -354,7 +354,11 @@ protected virtual async ValueTask OnDeathAsync(IAttacker attacker)
                 await player.AfterKilledMonsterAsync().ConfigureAwait(false);
             }
 
-            player.GameContext.PlugInManager.GetPlugInPoint<IAttackableGotKilledPlugIn>()?.AttackableGotKilled(this, attacker);
+            if (player.GameContext.PlugInManager.GetPlugInPoint<IAttackableGotKilledPlugIn>() is { } plugInPoint)
+            {
+                await plugInPoint.AttackableGotKilledAsync(this, attacker);
+            }
+
             if (player.SelectedCharacter!.State > HeroState.Normal)
             {
                 player.SelectedCharacter.StateRemainingSeconds -= (int)this.Attributes[Stats.Level];

diff --git a/src/GameLogic/Player.cs b/src/GameLogic/Player.cs
@@ -1770,7 +1770,11 @@ async Task RespawnAsync(CancellationToken cancellationToken)
 
         _ = RespawnAsync(this._respawnAfterDeathCts.Token);
 
-        this.GameContext.PlugInManager.GetPlugInPoint<IAttackableGotKilledPlugIn>()?.AttackableGotKilled(this, killer);
+        if (this.GameContext.PlugInManager.GetPlugInPoint<IAttackableGotKilledPlugIn>() is { } plugInPoint)
+        {
+            await plugInPoint.AttackableGotKilledAsync(this, killer);
+        }
+
         if (this.LastDeath is { } deathInformation)
         {
             this.Died?.Invoke(this, deathInformation);

diff --git a/src/GameLogic/PlugIns/GuildWarSoccerKillScorePlugIn.cs b/src/GameLogic/PlugIns/GuildWarSoccerKillScorePlugIn.cs
@@ -21,7 +21,7 @@ public class GuildWarKillScorePlugIn : IAttackableGotKilledPlugIn
     /// </summary>
     /// <param name="killed">The killed <see cref="IAttackable" />.</param>
     /// <param name="killer">The killer.</param>
-    public void AttackableGotKilled(IAttackable killed, IAttacker? killer)
+    public async ValueTask AttackableGotKilledAsync(IAttackable killed, IAttacker? killer)
     {
         if (killer is Player { GuildWarContext: not null } killerPlayer
             && killed is Player { GuildWarContext: not null } killedPlayer

diff --git a/src/GameLogic/PlugIns/IAttackableGotKilledPlugIn.cs b/src/GameLogic/PlugIns/IAttackableGotKilledPlugIn.cs
@@ -19,5 +19,5 @@ public interface IAttackableGotKilledPlugIn
     /// </summary>
     /// <param name="killed">The killed <see cref="IAttackable"/>.</param>
     /// <param name="killer">The killer.</param>
-    void AttackableGotKilled(IAttackable killed, IAttacker? killer);
+    ValueTask AttackableGotKilledAsync(IAttackable killed, IAttacker? killer);
 }
diff --git a/src/GameLogic/PlugIns/IObjectAddedToMapPlugIn.cs b/src/GameLogic/PlugIns/IObjectAddedToMapPlugIn.cs
@@ -19,5 +19,5 @@ public interface IObjectAddedToMapPlugIn
     /// </summary>
     /// <param name="map">The map.</param>
     /// <param name="addedObject">The added object.</param>
-    void ObjectAddedToMap(GameMap map, ILocateable addedObject);
+    ValueTask ObjectAddedToMapAsync(GameMap map, ILocateable addedObject);
 }
diff --git a/src/GameLogic/PlugIns/IObjectRemovedFromMapPlugIn.cs b/src/GameLogic/PlugIns/IObjectRemovedFromMapPlugIn.cs
@@ -19,5 +19,5 @@ public interface IObjectRemovedFromMapPlugIn
     /// </summary>
     /// <param name="map">The map.</param>
     /// <param name="removedObject">The removed object.</param>
-    void ObjectRemovedFromMap(GameMap map, ILocateable removedObject);
+    ValueTask ObjectRemovedFromMapAsync(GameMap map, ILocateable removedObject);
 }
diff --git a/src/GameLogic/PlugIns/InvasionEvents/BaseInvasionPlugIn.cs b/src/GameLogic/PlugIns/InvasionEvents/BaseInvasionPlugIn.cs
@@ -67,26 +67,18 @@ protected BaseInvasionPlugIn(MapEventType? mapEventType, (ushort MapId, ushort M
     protected virtual ushort[] PossibleMaps { get; } = { LorenciaId, NoriaId, DeviasId };
 
     /// <inheritdoc />
-    [System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "VSTHRD100:Avoid async void methods", Justification = "Catching all Exceptions.")]
-    public virtual async void ObjectAddedToMap(GameMap map, ILocateable addedObject)
+    public virtual async ValueTask ObjectAddedToMapAsync(GameMap map, ILocateable addedObject)
     {
-        try
+        if (this._mapEventType is null)
         {
-            if (this._mapEventType is null)
-            {
-                return;
-            }
-
-            if (addedObject is Player player)
-            {
-                var state = this.GetStateByGameContext(player.GameContext);
-                var isEnabled = state.State != PeriodicTaskState.NotStarted;
-                await this.TrySendMapEventStateUpdateAsync(player, isEnabled).ConfigureAwait(false);
-            }
+            return;
         }
-        catch
+
+        if (addedObject is Player player)
         {
-            // must be catched because it's an async void method.
+            var state = this.GetStateByGameContext(player.GameContext);
+            var isEnabled = state.State != PeriodicTaskState.NotStarted;
+            await this.TrySendMapEventStateUpdateAsync(player, isEnabled).ConfigureAwait(false);
         }
     }
 

diff --git a/src/GameLogic/PlugIns/QuestMonsterKillCountPlugIn.cs b/src/GameLogic/PlugIns/QuestMonsterKillCountPlugIn.cs
@@ -20,7 +20,7 @@ public class QuestMonsterKillCountPlugIn : IAttackableGotKilledPlugIn
     /// </summary>
     /// <param name="killed">The killed <see cref="IAttackable" />.</param>
     /// <param name="killer">The killer.</param>
-    public void AttackableGotKilled(IAttackable killed, IAttacker? killer)
+    public async ValueTask AttackableGotKilledAsync(IAttackable killed, IAttacker? killer)
     {
         if (!(killer is Player player && killed is Monster monster)
             || player.SelectedCharacter?.QuestStates is null)

diff --git a/src/GameLogic/PlugIns/WeatherUpdatePlugIn.cs b/src/GameLogic/PlugIns/WeatherUpdatePlugIn.cs
@@ -34,7 +34,7 @@ public async ValueTask ExecuteTaskAsync(GameContext gameContext)
         this._isRunning = true;
         try
         {
-            foreach (var map in await gameContext.GetMapsAsync())
+            foreach (var map in await gameContext.GetMapsAsync().ConfigureAwait(false))
             {
                 var weather = (byte)Rand.NextInt(0, 3);
                 var variation = (byte)Rand.NextInt(0, 10);
@@ -55,19 +55,20 @@ public async ValueTask ExecuteTaskAsync(GameContext gameContext)
     }
 
     /// <inheritdoc />
-    [System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "VSTHRD100:Avoid async void methods", Justification = "Catching all Exceptions.")]
-    public async void ObjectAddedToMap(GameMap map, ILocateable addedObject)
+    public async ValueTask ObjectAddedToMapAsync(GameMap map, ILocateable addedObject)
     {
+        if (addedObject is not Player player)
+        {
+            return;
+        }
+
         try
         {
-            if (addedObject is Player player)
-            {
-                await this.TrySendPlayerUpdateAsync(player).ConfigureAwait(false);
-            }
+            await this.TrySendPlayerUpdateAsync(player).ConfigureAwait(false);
         }
-        catch
+        catch (Exception ex)
         {
-            // must be catched because it's an async void method.
+            player.Logger.LogDebug(ex, "Unexpected error sending weather update.");
         }
     }