diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs index d33b00db..785b9936 100644 --- a/TShockAPI/Commands.cs +++ b/TShockAPI/Commands.cs @@ -3109,14 +3109,10 @@ namespace TShockAPI { if (args.Parameters.Count > 2) { - args.Player.SendMessage("Invalid syntax! Proper syntax: /butcher [killFriendly(true/false)] [killTownNPCs(true/false)]", Color.Red); + args.Player.SendMessage("Invalid syntax! Proper syntax: /butcher [killTownNPCs(true/false)]", Color.Red); return; } - bool killFriendly = true; - if (args.Parameters.Count == 1) - bool.TryParse(args.Parameters[0], out killFriendly); - bool killTownNPCs = false; if (args.Parameters.Count == 2) bool.TryParse(args.Parameters[1], out killTownNPCs); @@ -3124,7 +3120,7 @@ namespace TShockAPI int killcount = 0; for (int i = 0; i < Main.npc.Length; i++) { - if (Main.npc[i].active && Main.npc[i].type != 0 && (!Main.npc[i].townNPC || killTownNPCs) && (!Main.npc[i].friendly || killFriendly)) + if (Main.npc[i].active && Main.npc[i].type != 0 && (!Main.npc[i].townNPC || killTownNPCs)) { TSPlayer.Server.StrikeNPC(i, 99999, 90f, 1); killcount++;