Merge pull request #550 from nitoygo/bugfix/nova-not-activating

Fixed nova skill not activating
MUnique · Dec 9, 2024 · 910bf36 · 910bf36
2 parents 9442bf1 + b5a4042
commit 910bf36
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/src/GameLogic/PlayerActions/Skills/NovaSkillStartPlugin.cs b/src/GameLogic/PlayerActions/Skills/NovaSkillStartPlugin.cs
@@ -19,6 +19,8 @@ namespace MUnique.OpenMU.GameLogic.PlayerActions.Skills;
 [Guid("e966e7eb-58b8-4356-8725-5da9f43c1fa4")]
 public class NovaSkillStartPlugin : TargetedSkillPluginBase
 {
+    private const ushort NovaEndSkillId = 40;
+
     private static readonly TimeSpan NovaStepDelay = TimeSpan.FromMilliseconds(500);
 
     /// <summary>
@@ -38,7 +40,7 @@ public override async ValueTask PerformSkillAsync(Player player, IAttackable tar
             return;
         }
 
-        var skillEntry = player.SkillList?.GetSkill(skillId);
+        var skillEntry = player.SkillList?.GetSkill(NovaEndSkillId);
         if (skillEntry?.Skill is null)
         {
             return;
@@ -55,7 +57,7 @@ public override async ValueTask PerformSkillAsync(Player player, IAttackable tar
         var cancellationTokenSource = new SkillCancellationTokenSource();
         player.SkillCancelTokenSource = cancellationTokenSource;
 
-        _ = this.RunNovaAsync(player, skillEntry, cancellationTokenSource);
+        _ = Task.Run(() => this.RunNovaAsync(player, skillEntry, cancellationTokenSource));
     }
 
     private async ValueTask RunNovaAsync(Player player, SkillEntry skillEntry, SkillCancellationTokenSource cancellationTokenSource)

diff --git a/src/GameServer/MessageHandler/TargetedSkillHandlerPlugIn.cs b/src/GameServer/MessageHandler/TargetedSkillHandlerPlugIn.cs
@@ -45,11 +45,6 @@ public virtual async ValueTask HandlePacketAsync(Player player, Memory<byte> pac
     /// <param name="targetId">The target identifier.</param>
     protected async ValueTask HandleAsync(Player player, ushort skillId, ushort targetId)
     {
-        if (player.SkillList is null || !player.SkillList.ContainsSkill(skillId))
-        {
-            return;
-        }
-
         var strategy = player.GameContext.
             PlugInManager.GetStrategy<short, ITargetedSkillPlugin>((short)skillId) ??
             this._defaultStrategy;