From 00c2023c15ffea55a2b59428a7ee018ba0ecd252 Mon Sep 17 00:00:00 2001 From: Deathmax Date: Sun, 21 Aug 2011 22:36:42 +0800 Subject: [PATCH] Changed /annoy to use a simpler method than whoopie cushions. --- TShockAPI/TSPlayer.cs | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/TShockAPI/TSPlayer.cs b/TShockAPI/TSPlayer.cs index 426f9638..a4882f91 100644 --- a/TShockAPI/TSPlayer.cs +++ b/TShockAPI/TSPlayer.cs @@ -315,29 +315,13 @@ namespace TShockAPI { var time2 = (int)time; var launch = DateTime.UtcNow; - var player = 0; - for (int i = 0; i < Main.maxPlayers; i++) - if (Main.player[i] != null & Main.player[i].active && i != Index) - player = i; - SendMessage("You are now being annoyed.", Color.Red); - var oriinv = Main.player[player].inventory[0]; var startname = Name; + SendMessage("You are now being annoyed.", Color.Red); while ((DateTime.UtcNow - launch).TotalSeconds < time2 && startname == Name) { - Main.player[player].inventory[0].SetDefaults("Whoopie Cushion"); - Main.player[player].inventory[0].stack = 1; - SendData(PacketTypes.PlayerSlot, "Whoopie Cushion", player, 0f); - Main.player[player].position = TPlayer.position; - Main.player[player].selectedItem = 0; - Main.player[player].controlUseItem = true; - SendData(PacketTypes.PlayerUpdate, number: player); - Thread.Sleep(500); - Main.player[player].controlUseItem = false; - SendData(PacketTypes.PlayerUpdate, number: player); + SendData(PacketTypes.NpcSpecial, number: Index, number2: 2f); Thread.Sleep(50); } - Main.player[player].inventory[0] = oriinv; - SendData(PacketTypes.PlayerSlot, oriinv.name, player, 0f); } public virtual void SetBuff(int type, int time = 3600)