TShock PR16

Scavenger3 · Oct 21, 2013 · 1b9524a · 1b9524a
1 parent 2c0e0f8
commit 1b9524a
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 2 deletions.
diff --git a/Build/Essentials.dll b/Build/Essentials.dll
diff --git a/Build/SignCommands.dll b/Build/SignCommands.dll
diff --git a/Essentials/esMain.cs b/Essentials/esMain.cs
@@ -123,7 +123,7 @@ public void OnJoin(JoinEventArgs args)
 				ePly.DisabledY = Disabled[TShock.Players[args.Who].Name][1];
 				ePly.TSPlayer.Teleport(ePly.DisabledX * 16F, ePly.DisabledY * 16F);
 				ePly.Disabled = true;
-				ePly.TSPlayer.Disable();
+				ePly.Disable();
 				ePly.LastDisabledCheck = DateTime.UtcNow;
 				ePly.TSPlayer.SendErrorMessage("You are still disabled.");
 			}
@@ -369,7 +369,7 @@ public void OnUpdate(EventArgs args)
 					if (ePly.Disabled && ((DateTime.UtcNow - ePly.LastDisabledCheck).TotalMilliseconds) > 3000)
 					{
 						ePly.LastDisabledCheck = DateTime.UtcNow;
-						ePly.TSPlayer.Disable();
+						ePly.Disable();
 						if ((ePly.TSPlayer.TileX > ePly.DisabledX + 5 || ePly.TSPlayer.TileX < ePly.DisabledX - 5) || (ePly.TSPlayer.TileY > ePly.DisabledY + 5 || ePly.TSPlayer.TileY < ePly.DisabledY - 5))
 						{
 							ePly.TSPlayer.Teleport(ePly.DisabledX * 16F, ePly.DisabledY * 16F);

diff --git a/Essentials/esPlayer.cs b/Essentials/esPlayer.cs
@@ -60,6 +60,7 @@ public esPlayer(int index)
 
 		public void Disable()
 		{
+			this.TSPlayer.LastThreat = DateTime.UtcNow;
 			this.TSPlayer.SetBuff(33, 330, true); //Weak
 			this.TSPlayer.SetBuff(32, 330, true); //Slow
 			this.TSPlayer.SetBuff(23, 330, true); //Cursed

diff --git a/Refs/TShockAPI.dll b/Refs/TShockAPI.dll
diff --git a/Refs/TerrariaServer.exe b/Refs/TerrariaServer.exe