From 89bbbccdab51ef1dca8aef20ad326567e515a306 Mon Sep 17 00:00:00 2001 From: Lucas Nicodemus Date: Thu, 9 Jul 2015 09:41:31 -0600 Subject: [PATCH] Revert "TSPlayer.Disable() now uses new debuffs, removed weird code?" This reverts commit 9df043764c113baab1d00177e4a355edc5fa8ff5. --- TShockAPI/TSPlayer.cs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/TShockAPI/TSPlayer.cs b/TShockAPI/TSPlayer.cs index b5395883..96fba189 100755 --- a/TShockAPI/TSPlayer.cs +++ b/TShockAPI/TSPlayer.cs @@ -24,7 +24,6 @@ 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; @@ -771,17 +770,13 @@ 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(BuffID.Frozen, 330, true); - SetBuff(BuffID.Stoned, 330, true); - SetBuff(BuffID.Webbed, 330, true); + SetBuff(33, 330, true); //Weak + SetBuff(32, 330, true); //Slow + SetBuff(23, 330, true); //Cursed + SetBuff(47, 330, true); //Frozen if (ActiveChest != -1) { @@ -803,6 +798,11 @@ 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)