From dea2be832166c6c9a1a8d5d21d48dbb1489ca755 Mon Sep 17 00:00:00 2001
From: ike709 <ike709@users.noreply.github.com>
Date: Thu, 6 Feb 2020 09:15:39 -0600
Subject: [PATCH] =?UTF-8?q?Fixes=20"joingame"=20command=20allowing=20playe?=
 =?UTF-8?q?rs=20to=20join=20before=20round=20s=E2=80=A6=20(#595)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Content.Server/GameTicking/GameTickerCommands.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Content.Server/GameTicking/GameTickerCommands.cs b/Content.Server/GameTicking/GameTickerCommands.cs
index c8e3922b9f..a249fb7f7c 100644
--- a/Content.Server/GameTicking/GameTickerCommands.cs
+++ b/Content.Server/GameTicking/GameTickerCommands.cs
@@ -146,6 +146,12 @@ namespace Content.Server.GameTicking
             }
 
             var ticker = IoCManager.Resolve<IGameTicker>();
+            if (ticker.RunLevel == GameRunLevel.PreRoundLobby)
+            {
+                shell.SendText(player, "Round has not started.");
+                return;
+            }
+
             ticker.MakeJoinGame(player);
         }
     }