Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix no lobby, no job spawn (#6265)

Browse Source
This commit is contained in:
wrexbe
2022-01-23 09:44:27 -08:00
committed by GitHub
parent af1aa7ec77
commit 6a0a0cffd1
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Server/GameTicking/GameTicker.Spawning.cs
View File

@@ -91,9 +91,13 @@ namespace Content.Server.GameTicking
// Pick best job best on prefs. // Pick best job best on prefs.
jobId ??= PickBestAvailableJob(character, station); jobId ??= PickBestAvailableJob(character, station);
// If no job available, just bail out. // If no job available, stay in lobby, or if no lobby spawn as observer
if (jobId is null) if (jobId is null)
{ {
if (!LobbyEnabled)
{
MakeObserve(player);
}
_chatManager.DispatchServerMessage(player, Loc.GetString("game-ticker-player-no-jobs-available-when-joining")); _chatManager.DispatchServerMessage(player, Loc.GetString("game-ticker-player-no-jobs-available-when-joining"));
return; return;
} }
@@ -183,8 +187,6 @@ namespace Content.Server.GameTicking
if (DummyTicker) if (DummyTicker)
return; return;
if (!_playersInLobby.ContainsKey(player)) return;
PlayerJoinGame(player); PlayerJoinGame(player);
var name = GetPlayerProfile(player).Name; var name = GetPlayerProfile(player).Name;