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

Merge branch 'general-devel' of https://github.com/nyxstudios/TShock into general-devel

Browse source
This commit is contained in:
White 2015-07-10 16:59:44 +09:30
commit a99414e712
8 changed files with 44 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

14
TShockAPI/TSPlayer.cs
View file

@ -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();
/// <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)
{
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,6 +803,7 @@ namespace TShockAPI
LastDisableNotification = DateTime.UtcNow;
}
}
var trace = new StackTrace();
StackFrame frame = null;
frame = trace.GetFrame(1);