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

Revert "TSPlayer.Disable() now uses new debuffs, removed weird code?"

Browse source 
This reverts commit 9df043764c.
This commit is contained in:
Lucas Nicodemus 2015-07-09 09:41:31 -06:00
parent 9df043764c
commit 89bbbccdab
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
TShockAPI/TSPlayer.cs
View file

@ -24,7 +24,6 @@ using System.Text;
using System.Threading; using System.Threading;
using System.Timers; using System.Timers;
using Terraria; using Terraria;
using Terraria.ID;
using TShockAPI.DB; using TShockAPI.DB;
using TShockAPI.Net; using TShockAPI.Net;
using Timer = System.Timers.Timer; using Timer = System.Timers.Timer;
@ -771,17 +770,13 @@ namespace TShockAPI
public int ActiveChest = -1; public int ActiveChest = -1;
public Item ItemInHand = new Item(); public Item ItemInHand = new Item();
/// <summary>
/// Disables the player for the given <paramref name="reason"/>.
/// </summary>
/// <param name="reason">The reason why the player was disabled.</param>
/// <param name="displayConsole">Whether or not to log this event to the console.</param>
public virtual void Disable(string reason = "", bool displayConsole = true) public virtual void Disable(string reason = "", bool displayConsole = true)
{ {
LastThreat = DateTime.UtcNow; LastThreat = DateTime.UtcNow;
SetBuff(BuffID.Frozen, 330, true); SetBuff(33, 330, true); //Weak
SetBuff(BuffID.Stoned, 330, true); SetBuff(32, 330, true); //Slow
SetBuff(BuffID.Webbed, 330, true); SetBuff(23, 330, true); //Cursed
SetBuff(47, 330, true); //Frozen
if (ActiveChest != -1) if (ActiveChest != -1)
{ {
@ -803,6 +798,11 @@ namespace TShockAPI
LastDisableNotification = DateTime.UtcNow; 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) public virtual void Whoopie(object time)