Merge remote branch 'origin/general-devel' into general-devel

2013-10-01 04:38:55 -04:00 · 2013-10-01 04:38:55 -04:00 · 04e8f0b8ce
commit 04e8f0b8ce
parent f8440bae35 4e9698b6ee
2 changed files with 0 additions and 5 deletions
--- a/TShockAPI/GetDataHandlers.cs
+++ b/TShockAPI/GetDataHandlers.cs
@ -2163,11 +2163,6 @@ namespace TShockAPI
 				return true;
 			}

-			if (pulley > 2)
-			{
-				return true;
-			}
-
 			if (args.Player.LastNetPosition == Vector2.Zero)
 			{
 				return true;
--- a/TerrariaServerBins/TerrariaServer.exe
+++ b/TerrariaServerBins/TerrariaServer.exe