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

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

Browse source
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
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
TShockAPI/TShock.cs
View file

@ -1263,6 +1263,11 @@ namespace TShockAPI
/// <returns>True if allowed, otherwise false</returns> /// <returns>True if allowed, otherwise false</returns>
private bool OnCreep(int tileType) private bool OnCreep(int tileType)
{ {
if (WorldGen.generatingWorld)
{
return true;
}
if (!Config.Settings.AllowCrimsonCreep && (tileType == TileID.Dirt || tileType == TileID.CrimsonGrass if (!Config.Settings.AllowCrimsonCreep && (tileType == TileID.Dirt || tileType == TileID.CrimsonGrass
|| TileID.Sets.Crimson[tileType])) || TileID.Sets.Crimson[tileType]))
{ {
@ -1456,7 +1461,7 @@ namespace TShockAPI
if (!tsplr.FinishedHandshake) 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; args.Handled = true;
return; return;
} }