New config format, kill-at-y setting and more bug fixes

3 files changed, 16 insertions, 2 deletions

diff --git a/src/main/java/com/MylesAndMore/Tumble/commands/Config.java b/src/main/java/com/MylesAndMore/Tumble/commands/Config.java
index 256b45e..5fc2de6 100644
--- a/src/main/java/com/MylesAndMore/Tumble/commands/Config.java
+++ b/src/main/java/com/MylesAndMore/Tumble/commands/Config.java
@@ -35,7 +35,7 @@ public class Config implements CommandExecutor, TabCompleter {
         switch (args[0]) {
             case "add" -> {
                 String arenaName = args[1];
-                ConfigManager.arenas.put(arenaName, new Arena(arenaName, ((Player)sender).getLocation()));
+                ConfigManager.arenas.put(arenaName, new Arena(arenaName, ((Player)sender).getLocation(), null));
                 sender.sendMessage(ChatColor.GREEN + "Arena added.");
             }
             case "set" -> {
diff --git a/src/main/java/com/MylesAndMore/Tumble/commands/ForceStop.java b/src/main/java/com/MylesAndMore/Tumble/commands/ForceStop.java
index 8845e25..d862586 100644
--- a/src/main/java/com/MylesAndMore/Tumble/commands/ForceStop.java
+++ b/src/main/java/com/MylesAndMore/Tumble/commands/ForceStop.java
@@ -34,6 +34,11 @@ public class ForceStop implements CommandExecutor, TabCompleter {
             game = ConfigManager.arenas.get(args[0]).game;
         }
 
+        if (game == null) {
+            sender.sendMessage(ChatColor.RED + "No game is currently running in this arena");
+            return false;
+        }
+
         game.killGame();
         sender.sendMessage(ChatColor.GREEN + "Game stopped.");
         return true;
diff --git a/src/main/java/com/MylesAndMore/Tumble/commands/Reload.java b/src/main/java/com/MylesAndMore/Tumble/commands/Reload.java
index 5d35a03..a19b04b 100644
--- a/src/main/java/com/MylesAndMore/Tumble/commands/Reload.java
+++ b/src/main/java/com/MylesAndMore/Tumble/commands/Reload.java
@@ -1,5 +1,7 @@
 package com.MylesAndMore.Tumble.commands;
 
+import com.MylesAndMore.Tumble.game.Arena;
+import com.MylesAndMore.Tumble.plugin.ConfigManager;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
@@ -20,8 +22,15 @@ public class Reload implements CommandExecutor, TabCompleter {
             sender.sendMessage(ChatColor.RED + "You do not have permission to perform this command!");
             return false;
         }
+
+        for (Arena a : ConfigManager.arenas.values()) {
+            if (a.game != null) {
+                a.game.killGame();
+            }
+        }
+
         plugin.onEnable();
-        sender.sendMessage(ChatColor.GREEN + "Tumble configuration reloaded successfully.");
+        sender.sendMessage(ChatColor.GREEN + "Tumble configuration reloaded. Check console for errors.");
         return true;
     }