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

Merge pull request #1267 from ProfessorXZ/general-devel

Browse source 
Fixes #1197
This commit is contained in:
White 2016-08-02 13:50:45 +09:30 • committed by GitHub
commit b213236a02
4 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -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 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 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 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 ## TShock 4.3.17

2
TShockAPI/GetDataHandlers.cs
View file

@ -2490,7 +2490,7 @@ namespace TShockAPI
} }
if (!args.Player.HasPermission(Permissions.ignorenoclipdetection) && 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) && !args.TPlayer.tongued)
{ {
var lastTileX = args.Player.LastNetPosition.X; var lastTileX = args.Player.LastNetPosition.X;

2
TShockAPI/Permissions.cs
View file

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