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 @@ - - - - - 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); } /// 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) /// /// /// - public static void CollectNPC(this TSPlayer Player, int Range, HashSet notNpc) + public static void CollectNPC(this TSPlayer Player, int Range, HashSet 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)); }); } }