Clean up code and fix join cmd

4 files changed, 12 insertions, 6 deletions

diff --git a/src/main/java/com/MylesAndMore/Tumble/commands/ForceStart.java b/src/main/java/com/MylesAndMore/Tumble/commands/ForceStart.java
index a862268..bdead44 100644
--- a/src/main/java/com/MylesAndMore/Tumble/commands/ForceStart.java
+++ b/src/main/java/com/MylesAndMore/Tumble/commands/ForceStart.java
@@ -34,7 +34,7 @@ public class ForceStart implements CommandExecutor, TabCompleter {
             game = ConfigManager.arenas.get(args[0]).game;
         }
 
-        game.startGame();
+        game.gameStart();
         sender.sendMessage(ChatColor.GREEN + "Starting game");
         return true;
     }
diff --git a/src/main/java/com/MylesAndMore/Tumble/commands/ForceStop.java b/src/main/java/com/MylesAndMore/Tumble/commands/ForceStop.java
index d862586..ddd5826 100644
--- a/src/main/java/com/MylesAndMore/Tumble/commands/ForceStop.java
+++ b/src/main/java/com/MylesAndMore/Tumble/commands/ForceStop.java
@@ -39,7 +39,7 @@ public class ForceStop implements CommandExecutor, TabCompleter {
             return false;
         }
 
-        game.killGame();
+        game.gameEnd();
         sender.sendMessage(ChatColor.GREEN + "Game stopped.");
         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 4dd4ef8..de44da1 100644
--- a/src/main/java/com/MylesAndMore/Tumble/commands/Join.java
+++ b/src/main/java/com/MylesAndMore/Tumble/commands/Join.java
@@ -74,9 +74,15 @@ public class Join implements CommandExecutor, TabCompleter {
             if (arena.game == null) {
                 game = arena.game = new Game(arena, type);
             }
-            else {
-                sender.sendMessage(ChatColor.RED + "A game of "+type+" is currently taking place in this arena, choose another arena or join it with /tumble:join "+arena.name+" "+type);
-                return false;
+            else
+            {
+                if (arena.game.type == type) {
+                    game = arena.game;
+                }
+                else {
+                    sender.sendMessage(ChatColor.RED + "A game of "+type+" is currently taking place in this arena, choose another arena or join it with /tumble:join "+arena.name+" "+type);
+                    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 a19b04b..ca67a2e 100644
--- a/src/main/java/com/MylesAndMore/Tumble/commands/Reload.java
+++ b/src/main/java/com/MylesAndMore/Tumble/commands/Reload.java
@@ -25,7 +25,7 @@ public class Reload implements CommandExecutor, TabCompleter {
 
         for (Arena a : ConfigManager.arenas.values()) {
             if (a.game != null) {
-                a.game.killGame();
+                a.game.gameEnd();
             }
         }