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

Merge branch 'general-devel' into feat-death-command

Browse source
This commit is contained in:
Chris 2026-01-18 15:59:13 +10:30 • committed by GitHub
commit a67192d4de
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 326 additions and 312 deletions
Download patch file Download diff file Expand all files Collapse all files

4
TShockAPI/Bouncer.cs
View file

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

634
i18n/template.pot
View file

File diff suppressed because it is too large Load diff