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

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

Browse source
This commit is contained in:
Lucas Nicodemus 2017-12-27 19:01:38 -07:00
commit 2f7c146c89
6 changed files with 1 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

16
TShockAPI/Bouncer.cs
View file

@ -909,22 +909,6 @@ namespace TShockAPI
args.Handled = true;
return;
}
// Noclip detection
if (!args.Player.HasPermission(Permissions.ignorenoclipdetection) &&
TSCheckNoclip(pos, args.Player.TPlayer.width, args.Player.TPlayer.height - (args.Player.TPlayer.mount.Active ? args.Player.TPlayer.mount.HeightBoost : 0)) && !TShock.Config.IgnoreNoClip
&& !args.Player.TPlayer.tongued)
{
var lastTileX = args.Player.LastNetPosition.X;
var lastTileY = args.Player.LastNetPosition.Y;
if (!args.Player.Teleport(lastTileX, lastTileY))
{
args.Player.SendErrorMessage("You got stuck in a solid object, Sent to spawn point.");
args.Player.Spawn();
}
args.Handled = true;
return;
}
}
return;