Merge branch 'general-devel' into user-equatable

CHANGELOG.md

@@ -3,7 +3,15 @@
 This is the rolling changelog for TShock for Terraria. Use past tense when adding new entries; sign your name off when you add or change something. This should primarily be things like user changes, not necessarily codebase changes unless it's really relevant or large.
 
 ## Upcoming Changes
+* API: Added hooks for item, projectile and tile bans (@deadsurgeon42)
+* API: New WorldGrassSpread hook which shold allow corruption/crimson/hallow creep config options to work (@DeathCradle)
+* Fixed saving when one player is one the server and another one joins (@MarioE)
+* Fixed /spawnmob not spawning negative IDs (@MarioE)
+* Validated tile placement on PlaceObject; clients can no longer place frames, paintings etc with dirt blocks (@bartico6, @ProfessorXZ)
+* Updated to new stat tracking system with more data so we can actually make informed software decisions (Jordan Coulam)
 
+## TShock 4.3.24
+* API: Changed `PlayerHooks` permission hook mechanisms to allow negation from hooks (@deadsurgeon42)
 * Updated OpenTerraria API to 1.3.5.3 (@DeathCradle)
 * Updated Terraria Server API to 1.3.5.3 (@WhiteXZ, @hakusaro)
 * Updated TShock core components to 1.3.5.3 (@hakusaro)

README.md

@@ -1,6 +1,6 @@
 <p align="center">
   <img src="https://tshock.co/newlogo.png" alt="TShock for Terraria"><br />
-  <a href="https://travis-ci.org/NyxStudios/TShock"><img src="https://travis-ci.org/NyxStudios/TShock.png?branch=general-devel" alt="Build Status"></a><a href="https://ci.appveyor.com/project/hakusaro/tshock"><img src="https://ci.appveyor.com/api/projects/status/chhe61q227lqdlg1?svg=true" alt="AppVeyor Build Status"></a><br />
+  <a href="https://travis-ci.org/Pryaxis/TShock"><img src="https://travis-ci.org/Pryaxis/TShock.png?branch=general-devel" alt="Build Status"></a><a href="https://ci.appveyor.com/project/hakusaro/tshock"><img src="https://ci.appveyor.com/api/projects/status/chhe61q227lqdlg1?svg=true" alt="AppVeyor Build Status"></a><br />
   <hr />
 </p>
 

TShockAPI/DB/ItemManager.cs

@@ -201,8 +201,9 @@ namespace TShockAPI.DB
 			if (ply.HasPermission(Permissions.usebanneditem))
 				return true;
 
-			if (PlayerHooks.OnPlayerItembanPermission(ply, this))
+			PermissionHookResult hookResult = PlayerHooks.OnPlayerItembanPermission(ply, this);
-				return true;
+			if (hookResult != PermissionHookResult.Unhandled)
+				return hookResult == PermissionHookResult.Granted;
 
 			var cur = ply.Group;
 			var traversed = new List<Group>();

TShockAPI/DB/ProjectileManager.cs

@@ -206,8 +206,9 @@ namespace TShockAPI.DB
 			if (ply.HasPermission(Permissions.canusebannedprojectiles))
 				return true;
 
-			if (PlayerHooks.OnPlayerProjbanPermission(ply, this))
+			PermissionHookResult hookResult = PlayerHooks.OnPlayerProjbanPermission(ply, this);
-				return true;
+			if (hookResult != PermissionHookResult.Unhandled)
+				return hookResult == PermissionHookResult.Granted;
 
 			var cur = ply.Group;
 			var traversed = new List<Group>();

TShockAPI/DB/TileManager.cs

@@ -206,8 +206,9 @@ namespace TShockAPI.DB
 			if (ply.HasPermission(Permissions.canusebannedtiles))
 				return true;
 
-			if (PlayerHooks.OnPlayerTilebanPermission(ply, this))
+			PermissionHookResult hookResult = PlayerHooks.OnPlayerTilebanPermission(ply, this);
-				return true;
+			if (hookResult != PermissionHookResult.Unhandled)
+				return hookResult == PermissionHookResult.Granted;
 
 			var cur = ply.Group;
 			var traversed = new List<Group>();

TShockAPI/GetDataHandlers.cs

@@ -2350,6 +2350,15 @@ namespace TShockAPI
 				return true;
 			}
 
+			// This is neccessary to check in order to prevent special tiles such as 
+			// queen bee larva, paintings etc that use this packet from being placed 
+			// without selecting the right item.
+			if (type != args.TPlayer.inventory[args.TPlayer.selectedItem].createTile)
+			{
+				args.Player.SendTileSquare(x, y, 4);
+				return true;
+			}
+
 			TileObjectData tileData = TileObjectData.GetTileData(type, style, 0);
 			if (tileData == null)
 				return true;

TShockAPI/Hooks/PlayerHooks.cs

@@ -143,7 +143,7 @@ namespace TShockAPI.Hooks
 	/// <summary>
 	/// EventArgs used for the <see cref="PlayerHooks.PlayerPermission"/> event.
 	/// </summary>
-	public class PlayerPermissionEventArgs : HandledEventArgs
+	public class PlayerPermissionEventArgs
 	{
 		/// <summary>
 		/// The player who fired the event.
@@ -155,6 +155,11 @@ namespace TShockAPI.Hooks
 		/// </summary>
 		public string Permission { get; set; }
 
+		/// <summary>
+		/// <see cref="PermissionHookResult"/> of the hook.
+		/// </summary>
+		public PermissionHookResult Result { get; set; }
+
 		/// <summary>
 		/// Initializes a new instance of the PlayerPermissionEventArgs class.
 		/// </summary>
@@ -164,13 +169,14 @@ namespace TShockAPI.Hooks
 		{
 			Player = player;
 			Permission = permission;
+			Result = PermissionHookResult.Unhandled;
 		}
 	}
 
 	/// <summary>
 	/// EventArgs used for the <see cref="PlayerHooks.PlayerItembanPermission"/> event.
 	/// </summary>
-	public class PlayerItembanPermissionEventArgs : HandledEventArgs
+	public class PlayerItembanPermissionEventArgs
 	{
 		/// <summary>
 		/// The player who fired the event.
@@ -182,22 +188,28 @@ namespace TShockAPI.Hooks
 		/// </summary>
 		public ItemBan BannedItem { get; set; }
 
+		/// <summary>
+		/// <see cref="PermissionHookResult"/> of the hook.
+		/// </summary>
+		public PermissionHookResult Result { get; set; }
+
 		/// <summary>
 		/// Initializes a new instance of the PlayerItembanPermissionEventArgs class.
 		/// </summary>
 		/// <param name="player">The player who fired the event.</param>
-		/// <param name="permission">The permission being checked.</param>
+		/// <param name="bannedItem">The banned item being checked.</param>
 		public PlayerItembanPermissionEventArgs(TSPlayer player, ItemBan bannedItem)
 		{
 			Player = player;
 			BannedItem = bannedItem;
+			Result = PermissionHookResult.Unhandled;
 		}
 	}
 
 	/// <summary>
 	/// EventArgs used for the <see cref="PlayerHooks.PlayerProjbanPermission"/> event.
 	/// </summary>
-	public class PlayerProjbanPermissionEventArgs : HandledEventArgs
+	public class PlayerProjbanPermissionEventArgs
 	{
 		/// <summary>
 		/// The player who fired the event.
@@ -209,6 +221,11 @@ namespace TShockAPI.Hooks
 		/// </summary>
 		public ProjectileBan BannedProjectile { get; set; }
 
+		/// <summary>
+		/// <see cref="PermissionHookResult"/> of the hook.
+		/// </summary>
+		public PermissionHookResult Result { get; set; }
+
 		/// <summary>
 		/// Initializes a new instance of the PlayerProjbanPermissionEventArgs class.
 		/// </summary>
@@ -218,13 +235,14 @@ namespace TShockAPI.Hooks
 		{
 			Player = player;
 			BannedProjectile = checkedProjectile;
+			Result = PermissionHookResult.Unhandled;
 		}
 	}
 
 	/// <summary>
 	/// EventArgs used for the <see cref="PlayerHooks.PlayerTilebanPermission"/> event.
 	/// </summary>
-	public class PlayerTilebanPermissionEventArgs : HandledEventArgs
+	public class PlayerTilebanPermissionEventArgs
 	{
 		/// <summary>
 		/// The player who fired the event.
@@ -236,6 +254,11 @@ namespace TShockAPI.Hooks
 		/// </summary>
 		public TileBan BannedTile { get; set; }
 
+		/// <summary>
+		/// <see cref="PermissionHookResult"/> of the hook.
+		/// </summary>
+		public PermissionHookResult Result { get; set; }
+
 		/// <summary>
 		/// Initializes a new instance of the PlayerTilebanPermissionEventArgs class.
 		/// </summary>
@@ -245,6 +268,7 @@ namespace TShockAPI.Hooks
 		{
 			Player = player;
 			BannedTile = checkedTile;
+			Result = PermissionHookResult.Unhandled;
 		}
 	}
 
@@ -439,60 +463,79 @@ namespace TShockAPI.Hooks
 		/// Fires the <see cref="PlayerPermission"/> event.
 		/// </summary>
 		/// <param name="player">The player firing the event.</param>
-		/// <returns>True if the event has been handled.</returns>
+		/// <returns>Event result if the event has been handled, otherwise <see cref="PermissionHookResult.Unhandled"/>.</returns>
-		public static bool OnPlayerPermission(TSPlayer player, string permission)
+		public static PermissionHookResult OnPlayerPermission(TSPlayer player, string permission)
 		{
 			if (PlayerPermission == null)
-				return false;
+				return PermissionHookResult.Unhandled;
 
 			var args = new PlayerPermissionEventArgs(player, permission);
 			PlayerPermission(args);
-			return args.Handled;
+
+			return args.Result;
 		}
 
 		/// <summary>
 		/// Fires the <see cref="PlayerItembanPermission"/> event.
 		/// </summary>
 		/// <param name="player">The player firing the event.</param>
-		/// <returns>True if the event has been handled.</returns>
+		/// <returns>Event result if the event has been handled, otherwise <see cref="PermissionHookResult.Unhandled"/>.</returns>
-		public static bool OnPlayerItembanPermission(TSPlayer player, ItemBan bannedItem)
+		public static PermissionHookResult OnPlayerItembanPermission(TSPlayer player, ItemBan bannedItem)
 		{
 			if (PlayerItembanPermission == null)
-				return false;
+				return PermissionHookResult.Unhandled;
 
 			var args = new PlayerItembanPermissionEventArgs(player, bannedItem);
 			PlayerItembanPermission(args);
-			return args.Handled;
+
+			return args.Result;
 		}
 
 		/// <summary>
 		/// Fires the <see cref="PlayerProjbanPermission"/> event.
 		/// </summary>
 		/// <param name="player">The player firing the event.</param>
-		/// <returns>True if the event has been handled.</returns>
+		/// <returns>Event result if the event has been handled, otherwise <see cref="PermissionHookResult.Unhandled"/>.</returns>
-		public static bool OnPlayerProjbanPermission(TSPlayer player, ProjectileBan bannedProj)
+		public static PermissionHookResult OnPlayerProjbanPermission(TSPlayer player, ProjectileBan bannedProj)
 		{
 			if (PlayerProjbanPermission == null)
-				return false;
+				return PermissionHookResult.Unhandled;
 
 			var args = new PlayerProjbanPermissionEventArgs(player, bannedProj);
 			PlayerProjbanPermission(args);
-			return args.Handled;
+
+			return args.Result;
 		}
 
 		/// <summary>
 		/// Fires the <see cref="PlayerTilebanPermission"/> event.
 		/// </summary>
 		/// <param name="player">The player firing the event.</param>
-		/// <returns>True if the event has been handled.</returns>
+		/// <returns>Event result if the event has been handled, otherwise <see cref="PermissionHookResult.Unhandled"/>.</returns>
-		public static bool OnPlayerTilebanPermission(TSPlayer player, TileBan bannedTile)
+		public static PermissionHookResult OnPlayerTilebanPermission(TSPlayer player, TileBan bannedTile)
 		{
 			if (PlayerTilebanPermission == null)
-				return false;
+				return PermissionHookResult.Unhandled;
 
 			var args = new PlayerTilebanPermissionEventArgs(player, bannedTile);
 			PlayerTilebanPermission(args);
-			return args.Handled;
+
+			return args.Result;
 		}
+
 	}
+
+	/// <summary>
+	/// Defines the possible outcomes of <see cref="PlayerHooks.PlayerPermission"/> handlers.
+	/// </summary>
+	public enum PermissionHookResult
+	{
+		/// <summary>Hook doesn't return a result on the permission check.</summary>
+		Unhandled,
+		/// <summary>Permission is explicitly denied by a hook.</summary>
+		Denied,
+		/// <summary>Permission is explicitly granted by a hook.</summary>
+		Granted
+	}
+
 }

TShockAPI/Sockets/LinuxTcpSocket.cs

@@ -12,23 +12,23 @@ namespace TShockAPI.Sockets
 {
 	public class LinuxTcpSocket : ISocket
 	{
-		private byte[] _packetBuffer = new byte[1024];
+		public byte[] _packetBuffer = new byte[1024];
 
-		private int _packetBufferLength;
+		public int _packetBufferLength;
 
-		private List<object> _callbackBuffer = new List<object>();
+		public List<object> _callbackBuffer = new List<object>();
 
-		private int _messagesInQueue;
+		public int _messagesInQueue;
 
-		private TcpClient _connection;
+		public TcpClient _connection;
 
-		private TcpListener _listener;
+		public TcpListener _listener;
 
-		private SocketConnectionAccepted _listenerCallback;
+		public SocketConnectionAccepted _listenerCallback;
 
-		private RemoteAddress _remoteAddress;
+		public RemoteAddress _remoteAddress;
 
-		private bool _isListening;
+		public bool _isListening;
 
 		public int MessagesInQueue
 		{

TShockAPI/StatTracker.cs

@@ -160,10 +160,10 @@ namespace TShockAPI
 		{
 			if (plugins != null)
 			{
-				return plugins;//Return early
+				return plugins; //Return early
 			}
 
-			plugins = new PluginItem[ServerApi.Plugins.Count];//Initialize with enough room to store the ammount of plugins loaded.
+			plugins = new PluginItem[ServerApi.Plugins.Count]; //Initialize with enough room to store the ammount of plugins loaded.
 			for (var i = 0; i < ServerApi.Plugins.Count; i++)
 			{
 				var pluginItem = new PluginItem();
@@ -181,10 +181,10 @@ namespace TShockAPI
 		{
 			if (totalMem != 0)
 			{
-				return totalMem;//Return early 
+				return totalMem; //Return early 
 			}
 
-			if (isMono)//Set totalMem so it can be returned later
+			if (isMono) //Set totalMem so it can be returned later
 			{
 				var pc = new PerformanceCounter("Mono Memory", "Total Physical Memory");
 				totalMem = (pc.RawValue / 1024 / 1024 / 1024);

TShockAPI/TSPlayer.cs

@@ -1265,8 +1265,10 @@ namespace TShockAPI
 		/// <returns>True if the player has that permission.</returns>
 		public bool HasPermission(string permission)
 		{
-			if (PlayerHooks.OnPlayerPermission(this, permission))
+			PermissionHookResult hookResult = PlayerHooks.OnPlayerPermission(this, permission);
-				return true;
+
+			if (hookResult != PermissionHookResult.Unhandled)
+				return hookResult == PermissionHookResult.Granted;
 
 			if (tempGroup != null)
 				return tempGroup.HasPermission(permission);