Merge branch 'general-devel' into fix-single-player-dead

This commit is contained in:
Chris 2026-01-18 15:41:59 +10:30 committed by GitHub
commit 4a37b7d067
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -1263,6 +1263,11 @@ namespace TShockAPI
/// <returns>True if allowed, otherwise false</returns>
private bool OnCreep(int tileType)
{
if (WorldGen.generatingWorld)
{
return true;
}
if (!Config.Settings.AllowCrimsonCreep && (tileType == TileID.Dirt || tileType == TileID.CrimsonGrass
|| TileID.Sets.Crimson[tileType]))
{
@ -1456,7 +1461,7 @@ namespace TShockAPI
if (!tsplr.FinishedHandshake)
{
tsplr.Kick(GetString("Your client didn't send the right connection information."), true);
tsplr.Kick(GetString("Your client didn't send the right connection information."), true, true);
args.Handled = true;
return;
}