Merge branch 'master' into Improvements/msg-configuration

missilewars-plugin/pom.xml

@@ -26,7 +26,7 @@
         <version>1.0</version>
     </parent>
 
-    <version>4.4.2</version>
+    <version>4.5.1</version>
 
     <modelVersion>4.0.0</modelVersion>
 
@@ -82,19 +82,19 @@
             <version>0.5.1-SNAPSHOT</version>
         </dependency>
 
-        <!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core -->
+        <!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind -->
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-            <version>2.14.2</version>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.12.4</version>
             <scope>compile</scope>
         </dependency>
 
-        <!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind -->
+        <!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml -->
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>2.14.2</version>
+            <groupId>com.fasterxml.jackson.dataformat</groupId>
+            <artifactId>jackson-dataformat-yaml</artifactId>
+            <version>2.12.4</version>
             <scope>compile</scope>
         </dependency>
 

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/GameManager.java

@@ -24,13 +24,14 @@ import de.butzlabben.missilewars.configuration.Config;
 import de.butzlabben.missilewars.configuration.Lobby;
 import de.butzlabben.missilewars.util.geometry.GameArea;
 import de.butzlabben.missilewars.util.serialization.Serializer;
-import java.io.File;
-import java.io.IOException;
-import java.util.HashMap;
 import lombok.Getter;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 
+import java.io.File;
+import java.io.IOException;
+import java.util.HashMap;
+
 @Getter
 public class GameManager {
 
@@ -45,7 +46,11 @@ public class GameManager {
     }
 
     public void restartAll() {
-        games.values().forEach(game -> restartGame(game.getLobby(), false));
+        var iterator = games.values().iterator();
+        //noinspection WhileLoopReplaceableByForEach
+        while (iterator.hasNext()) {
+            restartGame(iterator.next().getLobby(), false);
+        }
     }
 
     /**

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());
         }