Various fixes

3 files changed, 14 insertions, 7 deletions

diff --git a/src/main/java/com/MylesAndMore/Tumble/commands/ForceStop.java b/src/main/java/com/MylesAndMore/Tumble/commands/ForceStop.java
index 5ca856b..24f430c 100644
--- a/src/main/java/com/MylesAndMore/Tumble/commands/ForceStop.java
+++ b/src/main/java/com/MylesAndMore/Tumble/commands/ForceStop.java
@@ -19,12 +19,12 @@ public class ForceStop implements SubCommand, CommandExecutor, TabCompleter {
 
     @Override
     public String getCommandName() {
-        return "forcestop";
+        return "forceStop";
     }
 
     @Override
     public String getPermission() {
-        return "tumble.forcestop";
+        return "tumble.forceStop";
     }
 
     @Override
@@ -52,7 +52,7 @@ public class ForceStop implements SubCommand, CommandExecutor, TabCompleter {
             return false;
         }
 
-        game.gameEnd();
+        game.stopGame();
         sender.sendMessage(languageManager.fromKey("forcestop-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 3bda96c..1dbbad6 100644
--- a/src/main/java/com/MylesAndMore/Tumble/commands/Join.java
+++ b/src/main/java/com/MylesAndMore/Tumble/commands/Join.java
@@ -5,7 +5,6 @@ import com.MylesAndMore.Tumble.game.Game;
 import com.MylesAndMore.Tumble.plugin.GameState;
 import com.MylesAndMore.Tumble.plugin.GameType;
 import com.MylesAndMore.Tumble.plugin.SubCommand;
-import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
@@ -37,7 +36,7 @@ public class Join implements SubCommand, CommandExecutor, TabCompleter {
     @Override
     public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) {
 
-        if (!(sender instanceof Player)) {
+        if (!(sender instanceof Player p)) {
             sender.sendMessage(languageManager.fromKey("not-for-console"));
             return false;
         }
@@ -61,7 +60,7 @@ public class Join implements SubCommand, CommandExecutor, TabCompleter {
         Game game;
         if (args.length < 2 || args[1] == null) {
             if (arena.game == null) {
-                sender.sendMessage(ChatColor.RED + "no game is currently taking place in this arena, specify the game type to start one");
+                sender.sendMessage(languageManager.fromKey("specify-game-type"));
                 return false;
             }
             else {
@@ -97,6 +96,14 @@ public class Join implements SubCommand, CommandExecutor, TabCompleter {
             }
         }
 
+        if (game.arena.gameSpawn == null) {
+            if (p.isOp()) {
+                sender.sendMessage(languageManager.fromKey("arena-not-ready-op"));
+            } else {
+                sender.sendMessage(languageManager.fromKey("arena-not-ready"));
+            }
+        }
+
         if (game.gameState != GameState.WAITING) {
             sender.sendMessage(languageManager.fromKey("game-in-progress"));
             return false;
diff --git a/src/main/java/com/MylesAndMore/Tumble/commands/Reload.java b/src/main/java/com/MylesAndMore/Tumble/commands/Reload.java
index 7d6041e..03ce42d 100644
--- a/src/main/java/com/MylesAndMore/Tumble/commands/Reload.java
+++ b/src/main/java/com/MylesAndMore/Tumble/commands/Reload.java
@@ -30,7 +30,7 @@ public class Reload implements SubCommand, CommandExecutor, TabCompleter {
 
         for (Arena a : arenaManager.arenas.values()) {
             if (a.game != null) {
-                a.game.gameEnd();
+                a.game.stopGame();
             }
         }