Merge branch 'general-devel' into general-devel

This commit is contained in:
Chris 2026-01-18 16:07:07 +10:30 committed by GitHub
commit fde4114be8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 1136 additions and 968 deletions

View file

@ -2565,8 +2565,8 @@ namespace TShockAPI
}
//Generic bounds checking, though I'm not sure if anyone would willingly hack themselves outside the map?
if (args.NewPosition.X > Main.maxTilesX || args.NewPosition.X < 0
|| args.NewPosition.Y > Main.maxTilesY || args.NewPosition.Y < 0)
if (args.NewPosition.X > Main.maxTilesX *16 || args.NewPosition.X < 0
|| args.NewPosition.Y > Main.maxTilesY *16 || args.NewPosition.Y < 0)
{
TShock.Log.ConsoleDebug(GetString("Bouncer / OnPlayerPortalTeleport rejected teleport out of bounds from {0}", args.Player.Name));
args.Handled = true;