From bfe407024e8937f32c85863f49a972dab50ea206 Mon Sep 17 00:00:00 2001 From: Enerdy Date: Thu, 9 Jul 2015 15:43:20 +0100 Subject: [PATCH] TSPlayer.Disable() now uses new debuffs, removed weird code? --- TShockAPI/TSPlayer.cs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/TShockAPI/TSPlayer.cs b/TShockAPI/TSPlayer.cs index 96fba189..b5395883 100755 --- a/TShockAPI/TSPlayer.cs +++ b/TShockAPI/TSPlayer.cs @@ -24,6 +24,7 @@ using System.Text; using System.Threading; using System.Timers; using Terraria; +using Terraria.ID; using TShockAPI.DB; using TShockAPI.Net; using Timer = System.Timers.Timer; @@ -770,13 +771,17 @@ namespace TShockAPI public int ActiveChest = -1; public Item ItemInHand = new Item(); + /// + /// Disables the player for the given . + /// + /// The reason why the player was disabled. + /// Whether or not to log this event to the console. public virtual void Disable(string reason = "", bool displayConsole = true) { LastThreat = DateTime.UtcNow; - SetBuff(33, 330, true); //Weak - SetBuff(32, 330, true); //Slow - SetBuff(23, 330, true); //Cursed - SetBuff(47, 330, true); //Frozen + SetBuff(BuffID.Frozen, 330, true); + SetBuff(BuffID.Stoned, 330, true); + SetBuff(BuffID.Webbed, 330, true); if (ActiveChest != -1) { @@ -798,11 +803,6 @@ namespace TShockAPI LastDisableNotification = DateTime.UtcNow; } } - var trace = new StackTrace(); - StackFrame frame = null; - frame = trace.GetFrame(1); - if (frame != null && frame.GetMethod().DeclaringType != null) - TShock.Log.Debug(frame.GetMethod().DeclaringType.Name + " called Disable()."); } public virtual void Whoopie(object time)