tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Oh god (#5534)

Browse Source 
* Fixes the funny station issue and prevents free respawns

* not in the sudoers file
This commit is contained in:
Moony
2021-11-26 04:03:29 -06:00
committed by GitHub
parent 7aa5818cd2
commit 85ea135ad4
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Server/GameTicking/Commands/JoinGameCommand.cs
View File

@@ -43,6 +43,13 @@ namespace Content.Server.GameTicking.Commands
var ticker = EntitySystem.Get<GameTicker>(); var ticker = EntitySystem.Get<GameTicker>();
var stationSystem = EntitySystem.Get<StationSystem>(); var stationSystem = EntitySystem.Get<StationSystem>();
if (!ticker.PlayersInLobby.ContainsKey(player))
{
shell.WriteError($"{player.Name} not in the lobby. This incident will be reported.");
return;
}
if (ticker.RunLevel == GameRunLevel.PreRoundLobby) if (ticker.RunLevel == GameRunLevel.PreRoundLobby)
{ {
shell.WriteLine("Round has not started."); shell.WriteLine("Round has not started.");

2
Content.Server/Station/StationSystem.cs
View File

@@ -35,7 +35,7 @@ public class StationSystem : EntitySystem
/// </summary> /// </summary>
private void OnRoundEnd(GameRunLevelChangedEvent eventArgs) private void OnRoundEnd(GameRunLevelChangedEvent eventArgs)
{ {
if (eventArgs.New == GameRunLevel.PostRound) if (eventArgs.New == GameRunLevel.PreRoundLobby)
_stationInfo = new(); _stationInfo = new();
} }