Merge pull request #83 from RedstoneFuture/fixing/hotfix/misc

Various fixes

missilewars-plugin/src/main/java/de/butzlabben/missilewars/commands/UserCommands.java

@@ -93,8 +93,13 @@ public class UserCommands extends BaseCommand {
 
         if (!MWCommands.senderIsPlayer(sender)) return;
         Player player = (Player) sender;
+        
+        if (args.length < 1) {
+            player.sendMessage(Messages.getPrefix() + "§cNumber needed.");
+            return;
+        }
 
-        if (args.length > 0) {
+        if (args.length > 1) {
             player.sendMessage(Messages.getPrefix() + "§cToo many arguments.");
             return;
         }

missilewars-plugin/src/main/java/de/butzlabben/missilewars/configuration/Config.java

@@ -176,6 +176,9 @@ public class Config {
         cfg.set("fallback_spawn.z", spawnLocation.getZ());
         cfg.set("fallback_spawn.yaw", spawnLocation.getYaw());
         cfg.set("fallback_spawn.pitch", spawnLocation.getPitch());
+
+        // re-save the config with only validated options
+        SetupUtil.safeFile(FILE, cfg);
     }
 
     public static YamlConfiguration getConfig() {

missilewars-plugin/src/main/java/de/butzlabben/missilewars/game/misc/MissileWarsPlaceholder.java

@@ -74,8 +74,8 @@ public class MissileWarsPlaceholder extends PlaceholderExpansion {
                 if (params.startsWith("arena_")) return "§c§oThis is not a game arena!";
             }
 
-            if (params.startsWith("lobby_")) params = params.replace("_this", playerGame.getLobby().getName());
-            if (params.startsWith("arena_")) params = params.replace("_this", playerGame.getArena().getName());
+            if (params.startsWith("lobby_")) params = params.replace("this", playerGame.getLobby().getName());
+            if (params.startsWith("arena_")) params = params.replace("this", playerGame.getArena().getName());
         }