More code clean up and comments

2 files changed, 10 insertions, 4 deletions

diff --git a/src/main/java/com/MylesAndMore/Tumble/commands/ForceStart.java b/src/main/java/com/MylesAndMore/Tumble/commands/ForceStart.java
index d05155d..121b946 100644
--- a/src/main/java/com/MylesAndMore/Tumble/commands/ForceStart.java
+++ b/src/main/java/com/MylesAndMore/Tumble/commands/ForceStart.java
@@ -1,6 +1,7 @@
 package com.MylesAndMore.Tumble.commands;
 
 import com.MylesAndMore.Tumble.game.Game;
+import com.MylesAndMore.Tumble.plugin.GameState;
 import com.MylesAndMore.Tumble.plugin.SubCommand;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
@@ -53,6 +54,10 @@ public class ForceStart implements SubCommand, CommandExecutor, TabCompleter {
             return false;
         }
 
+        if (game.gameState != GameState.WAITING) {
+            return false;
+        }
+
         game.gameStart();
         sender.sendMessage(languageManager.fromKey("forcestart-success"));
         return true;
diff --git a/src/main/java/com/MylesAndMore/Tumble/commands/Join.java b/src/main/java/com/MylesAndMore/Tumble/commands/Join.java
index 3989960..6b5494d 100644
--- a/src/main/java/com/MylesAndMore/Tumble/commands/Join.java
+++ b/src/main/java/com/MylesAndMore/Tumble/commands/Join.java
@@ -59,16 +59,17 @@ public class Join implements SubCommand, CommandExecutor, TabCompleter {
 
         Game game;
         if (args.length < 2 || args[1] == null) {
-            // try to infer game type from game taking place in the arena
+            // no type specified: try to infer game type from game taking place in the arena
             if (arena.game == null) {
+                // cant infer if no game is taking place
                 sender.sendMessage(languageManager.fromKey("specify-game-type"));
                 return false;
             }
-            else {
-                game = arena.game;
-            }
+
+            game = arena.game;
         }
         else {
+            // type specified
             GameType type;
             switch (args[1]) {
                 case "shovels", "shovel"     -> type = GameType.SHOVELS;