Merge pull request #1267 from ProfessorXZ/general-devel

Fixes #1197

CHANGELOG.md

@@ -13,6 +13,7 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin
 * Fixed players being able to bypass permission checks when placing items in Item Frames (@ProfessorXZ)
 * Fixed a bug involving Item Frames which allowed players to duplicate items (@ProfessorXZ)
 * Fixed an issue allowing clients to teleport NPCs to arbitrary locations (@ProfessorXZ)
+* Fixed a bug where players would get teleported to their previous location after dismounting the Unicorn Mount (@ProfessorXZ)
 
 ## TShock 4.3.17
 

TShockAPI/GetDataHandlers.cs

@@ -2490,7 +2490,7 @@ namespace TShockAPI
 				}
 
 				if (!args.Player.HasPermission(Permissions.ignorenoclipdetection) &&
-					TSCheckNoclip(pos, args.TPlayer.width, args.TPlayer.height) && !TShock.Config.IgnoreNoClip
+					TSCheckNoclip(pos, args.TPlayer.width, args.TPlayer.height - (args.TPlayer.mount.Active ? args.Player.TPlayer.mount.HeightBoost : 0)) && !TShock.Config.IgnoreNoClip
 					&& !args.TPlayer.tongued)
 				{
 					var lastTileX = args.Player.LastNetPosition.X;

TShockAPI/Permissions.cs

@@ -308,8 +308,8 @@ namespace TShockAPI
 		[Description("User can set the world spawn.")]
 		public static readonly string worldspawn = "tshock.world.setspawn";
 
-	    [Description( "User can set the dungeon's location." )]
-        public static readonly string dungeonposition = "tshock.world.setdungeon";
+		[Description("User can set the dungeon's location.")]
+		public static readonly string dungeonposition = "tshock.world.setdungeon";
 
 		[Description("User can drop a meteor.")]
 		public static readonly string dropmeteor = "tshock.world.time.dropmeteor";

TShockAPI/TShock.cs

@@ -1069,7 +1069,7 @@ namespace TShockAPI
 
 						if (CheckIgnores(player))
 						{
-                            player.Disable(flags: flags);
+							player.Disable(flags: flags);
 						}
 						else if (Itembans.ItemIsBanned(player.TPlayer.inventory[player.TPlayer.selectedItem].name, player))
 						{