themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Target Dummies no longer get butchered by /butcher. Fixes #1025

Browse source
This commit is contained in:
Denwey Tharkt 2015-07-17 20:38:56 -03:00
parent 6f0a23c8fc
commit e8ce773fdb
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
TShockAPI/Commands.cs
View file

@ -26,6 +26,7 @@ using System.Linq;
using System.Text; using System.Text;
using System.Threading; using System.Threading;
using Terraria; using Terraria;
using Terraria.ID;
using TShockAPI.DB; using TShockAPI.DB;
using TerrariaApi.Server; using TerrariaApi.Server;
using TShockAPI.Hooks; using TShockAPI.Hooks;
@ -5003,7 +5004,7 @@ namespace TShockAPI
int kills = 0; int kills = 0;
for (int i = 0; i < Main.npc.Length; i++) 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); TSPlayer.Server.StrikeNPC(i, 99999, 0, 0);
kills++; kills++;