From 8501ac17a90bb6cc04b1208c8e7ca93c87a47f73 Mon Sep 17 00:00:00 2001
From: Controllerdestiny <523321293@qq.com>
Date: Mon, 20 May 2024 12:16:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20Economics.Skill=20?=
 =?UTF-8?q?=E6=8F=92=E4=BB=B6=E6=8B=89=E6=80=AA=E4=BD=8D=E7=BD=AE=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E5=A4=B1=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Economics.Skill/Economics.Skill.csproj | 5 -----
 Economics.Skill/Utils.cs               | 2 +-
 EconomicsAPI/Extensions/TSPlayerExt.cs | 4 ++--
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/Economics.Skill/Economics.Skill.csproj b/Economics.Skill/Economics.Skill.csproj
index 33573e42..f04703be 100644
--- a/Economics.Skill/Economics.Skill.csproj
+++ b/Economics.Skill/Economics.Skill.csproj
@@ -12,9 +12,4 @@
 		<ProjectReference Include="..\Economics.RPG\Economics.RPG.csproj" />
 		<ProjectReference Include="..\EconomicsAPI\EconomicsAPI.csproj" />
 	</ItemGroup>
-
-	<ItemGroup>
-	  <Folder Include="Extensions\" />
-	</ItemGroup>
-
 </Project>
diff --git a/Economics.Skill/Utils.cs b/Economics.Skill/Utils.cs
index a1209f18..0cffcf40 100644
--- a/Economics.Skill/Utils.cs
+++ b/Economics.Skill/Utils.cs
@@ -44,7 +44,7 @@ public static void EmitGeneralSkill(TSPlayer Player, SkillContext skill)
         Player.ExecRangeCommands(skill.ExecCommand.Range, skill.ExecCommand.Commands);
         Player.HealAllLife(skill.HealPlayerHPOption.Range, skill.HealPlayerHPOption.HP);
         Player.ClearProj(skill.ClearProjectile.Range);
-        Player.CollectNPC(skill.PullNpc.Range, Skill.Config.BanPullNpcs);
+        Player.CollectNPC(skill.PullNpc.Range, Skill.Config.BanPullNpcs, skill.PullNpc.X, skill.PullNpc.Y);
     }
 
     /// <summary>
diff --git a/EconomicsAPI/Extensions/TSPlayerExt.cs b/EconomicsAPI/Extensions/TSPlayerExt.cs
index d2aa92d6..3e995f94 100644
--- a/EconomicsAPI/Extensions/TSPlayerExt.cs
+++ b/EconomicsAPI/Extensions/TSPlayerExt.cs
@@ -136,12 +136,12 @@ public static void ReSpawn(this TSPlayer Player)
     /// <param name="Player"></param>
     /// <param name="Range"></param>
     /// <param name="code"></param>
-    public static void CollectNPC(this TSPlayer Player, int Range, HashSet<int> notNpc)
+    public static void CollectNPC(this TSPlayer Player, int Range, HashSet<int> notNpc, int x = 0, int y = 0)
     {
         Player.GetNpcInRange(Range).ForEach(npc =>
         {
             if (!notNpc.Contains(npc.type))
-                npc.Teleport(Player.TPlayer.position);
+                npc.Teleport(Player.TPlayer.position + new Vector2(x, y));
         });
     }
 }