From e8ce773fdbc4b8490cf18e5bb4b3e3ffafcdd50c Mon Sep 17 00:00:00 2001 From: Denwey Tharkt Date: Fri, 17 Jul 2015 20:38:56 -0300 Subject: [PATCH] Target Dummies no longer get butchered by /butcher. Fixes #1025 --- TShockAPI/Commands.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs index 36e9ffe3..673efc69 100755 --- a/TShockAPI/Commands.cs +++ b/TShockAPI/Commands.cs @@ -26,6 +26,7 @@ using System.Linq; using System.Text; using System.Threading; using Terraria; +using Terraria.ID; using TShockAPI.DB; using TerrariaApi.Server; using TShockAPI.Hooks; @@ -5003,7 +5004,7 @@ namespace TShockAPI int kills = 0; for (int i = 0; i < Main.npc.Length; i++) { - if (Main.npc[i].active && ((npcId == 0 && !Main.npc[i].townNPC) || Main.npc[i].netID == npcId)) + if (Main.npc[i].active && ((npcId == 0 && !Main.npc[i].townNPC && Main.npc[i].netID != NPCID.TargetDummy) || Main.npc[i].netID == npcId)) { TSPlayer.Server.StrikeNPC(i, 99999, 0, 0); kills++;