Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Evil Factory
2025-12-08 12:35:44 -03:00
122 changed files with 1614 additions and 819 deletions
@@ -55,13 +55,13 @@ namespace Barotrauma.Networking
PasswordRetries = 0;
PasswordSalt = null;
UpdateTime = Timing.TotalTime + Timing.Step * 3.0;
TimeOut = NetworkConnection.TimeoutThreshold;
TimeOut = NetworkConnection.TimeoutThresholdNotInGame;
AuthSessionStarted = false;
}
public void Heartbeat()
{
TimeOut = NetworkConnection.TimeoutThreshold;
TimeOut = NetworkConnection.TimeoutThresholdNotInGame;
}
}
@@ -124,7 +124,7 @@ namespace Barotrauma.Networking
protected void ReadConnectionInitializationStep(PendingClient pendingClient, IReadMessage inc, ConnectionInitialization initializationStep)
{
pendingClient.TimeOut = NetworkConnection.TimeoutThreshold;
pendingClient.TimeOut = NetworkConnection.TimeoutThresholdNotInGame;
if (pendingClient.InitializationStep != initializationStep) { return; }