bugfixes and more stylistic changes

- remove update checker and multiverse from build dependencies
- add config option to hide death messages
- ensure join/leave/death messages only apply for tumble games
- fix a bunch of random command bugs I found
- layers no longer generate with a placeholder material before being clumped
- misc refactoring

8 files changed, 20 insertions, 19 deletions

diff --git a/src/main/java/com/MylesAndMore/Tumble/commands/Create.java b/src/main/java/com/MylesAndMore/Tumble/commands/Create.java
index 667be5e..d60ca64 100644
--- a/src/main/java/com/MylesAndMore/Tumble/commands/Create.java
+++ b/src/main/java/com/MylesAndMore/Tumble/commands/Create.java
@@ -33,7 +33,7 @@ public class Create implements SubCommand, CommandExecutor, TabCompleter {
 
         String arenaName = args[0];
         ArenaManager.arenas.put(arenaName, new Arena(arenaName));
-        ArenaManager.WriteConfig();
+        ArenaManager.writeConfig();
         sender.sendMessage(LanguageManager.fromKey("create-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 3f1a8fb..f26d4e5 100644
--- a/src/main/java/com/MylesAndMore/Tumble/commands/Join.java
+++ b/src/main/java/com/MylesAndMore/Tumble/commands/Join.java
@@ -56,6 +56,16 @@ public class Join implements SubCommand, CommandExecutor, TabCompleter {
         }
         Arena arena = ArenaManager.arenas.get(arenaName);
 
+        // Check to make sure this arena has a game spawn
+        if (arena.gameSpawn == null) {
+            if (p.isOp()) {
+                sender.sendMessage(LanguageManager.fromKey("arena-not-ready-op"));
+            } else {
+                sender.sendMessage(LanguageManager.fromKey("arena-not-ready"));
+            }
+            return false;
+        }
+
         Game game;
         if (args.length < 2 || args[1] == null) {
             // No type specified: try to infer game type from game taking place in the arena
@@ -80,10 +90,10 @@ public class Join implements SubCommand, CommandExecutor, TabCompleter {
             }
 
             if (arena.game == null) {
-                // no game is taking place in this arena, start one
+                // No game is taking place in this arena, start one
                 game = arena.game = new Game(arena, type);
             } else {
-                // a game is taking place in this arena, check that it is the right type
+                // A game is taking place in this arena, check that it is the right type
                 if (arena.game.type == type) {
                     game = arena.game;
                 }
@@ -96,16 +106,7 @@ public class Join implements SubCommand, CommandExecutor, TabCompleter {
             }
         }
 
-        // Check to make sure the arena has a game spawn
-        if (game.arena.gameSpawn == null) {
-            if (p.isOp()) {
-                sender.sendMessage(LanguageManager.fromKey("arena-not-ready-op"));
-            } else {
-                sender.sendMessage(LanguageManager.fromKey("arena-not-ready"));
-            }
-            return false;
-        }
-
+        // Make sure the game isn't in progress before adding the player
         if (game.gameState != GameState.WAITING) {
             sender.sendMessage(LanguageManager.fromKey("game-in-progress"));
             return false;
diff --git a/src/main/java/com/MylesAndMore/Tumble/commands/Remove.java b/src/main/java/com/MylesAndMore/Tumble/commands/Remove.java
index c2aa149..9abc784 100644
--- a/src/main/java/com/MylesAndMore/Tumble/commands/Remove.java
+++ b/src/main/java/com/MylesAndMore/Tumble/commands/Remove.java
@@ -38,7 +38,7 @@ public class Remove implements SubCommand, CommandExecutor, TabCompleter {
         }
 
         ArenaManager.arenas.remove(arenaName);
-        ArenaManager.WriteConfig();
+        ArenaManager.writeConfig();
         sender.sendMessage(LanguageManager.fromKey("remove-success"));
         return true;
     }
diff --git a/src/main/java/com/MylesAndMore/Tumble/commands/SetGameSpawn.java b/src/main/java/com/MylesAndMore/Tumble/commands/SetGameSpawn.java
index 21bdfe8..817a1a4 100644
--- a/src/main/java/com/MylesAndMore/Tumble/commands/SetGameSpawn.java
+++ b/src/main/java/com/MylesAndMore/Tumble/commands/SetGameSpawn.java
@@ -45,7 +45,7 @@ public class SetGameSpawn implements SubCommand, CommandExecutor, TabCompleter {
         Arena arena = ArenaManager.arenas.get(arenaName);
 
         arena.gameSpawn = ((Player)sender).getLocation();
-        ArenaManager.WriteConfig();
+        ArenaManager.writeConfig();
         sender.sendMessage(LanguageManager.fromKey("set-success"));
         return true;
     }
diff --git a/src/main/java/com/MylesAndMore/Tumble/commands/SetKillYLevel.java b/src/main/java/com/MylesAndMore/Tumble/commands/SetKillYLevel.java
index 142ffdd..27cc410 100644
--- a/src/main/java/com/MylesAndMore/Tumble/commands/SetKillYLevel.java
+++ b/src/main/java/com/MylesAndMore/Tumble/commands/SetKillYLevel.java
@@ -46,7 +46,7 @@ public class SetKillYLevel implements SubCommand, CommandExecutor, TabCompleter
         Arena arena = ArenaManager.arenas.get(arenaName);
 
         arena.killAtY = ((int) ((Player) sender).getLocation().getY());
-        ArenaManager.WriteConfig();
+        ArenaManager.writeConfig();
         sender.sendMessage(LanguageManager.fromKey("set-success"));
         return true;
     }
diff --git a/src/main/java/com/MylesAndMore/Tumble/commands/SetLobby.java b/src/main/java/com/MylesAndMore/Tumble/commands/SetLobby.java
index a080d08..5708643 100644
--- a/src/main/java/com/MylesAndMore/Tumble/commands/SetLobby.java
+++ b/src/main/java/com/MylesAndMore/Tumble/commands/SetLobby.java
@@ -45,7 +45,7 @@ public class SetLobby implements SubCommand, CommandExecutor, TabCompleter {
         Arena arena = ArenaManager.arenas.get(arenaName);
 
         arena.lobby = ((Player)sender).getLocation();
-        ArenaManager.WriteConfig();
+        ArenaManager.writeConfig();
         sender.sendMessage(LanguageManager.fromKey("set-success"));
         return true;
     }
diff --git a/src/main/java/com/MylesAndMore/Tumble/commands/SetWaitArea.java b/src/main/java/com/MylesAndMore/Tumble/commands/SetWaitArea.java
index a96e1a9..7b90099 100644
--- a/src/main/java/com/MylesAndMore/Tumble/commands/SetWaitArea.java
+++ b/src/main/java/com/MylesAndMore/Tumble/commands/SetWaitArea.java
@@ -45,7 +45,7 @@ public class SetWaitArea implements SubCommand, CommandExecutor, TabCompleter {
         Arena arena = ArenaManager.arenas.get(arenaName);
 
         arena.waitArea = ((Player)sender).getLocation();
-        ArenaManager.WriteConfig();
+        ArenaManager.writeConfig();
         sender.sendMessage(LanguageManager.fromKey("set-success"));
         return true;
     }
diff --git a/src/main/java/com/MylesAndMore/Tumble/commands/SetWinnerLobby.java b/src/main/java/com/MylesAndMore/Tumble/commands/SetWinnerLobby.java
index 98a535b..e0d2bea 100644
--- a/src/main/java/com/MylesAndMore/Tumble/commands/SetWinnerLobby.java
+++ b/src/main/java/com/MylesAndMore/Tumble/commands/SetWinnerLobby.java
@@ -45,7 +45,7 @@ public class SetWinnerLobby implements SubCommand, CommandExecutor, TabCompleter
         Arena arena = ArenaManager.arenas.get(arenaName);
 
         arena.winnerLobby = ((Player)sender).getLocation();
-        ArenaManager.WriteConfig();
+        ArenaManager.writeConfig();
         sender.sendMessage(LanguageManager.fromKey("set-success"));
         return true;
     }