From 9f1fc3fe7b68eb948b6b687b19730c84d48008bf Mon Sep 17 00:00:00 2001
From: Brokkonaut <hannos17@gmx.de>
Date: Sun, 29 Jul 2018 15:31:59 +0200
Subject: [PATCH] Do not check for invalid materials in the config before
 upgrading them

---
 .../java/de/diddiz/LogBlock/config/Config.java     | 14 ++++++++++----
 .../de/diddiz/LogBlock/config/WorldConfig.java     |  4 +++-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/main/java/de/diddiz/LogBlock/config/Config.java b/src/main/java/de/diddiz/LogBlock/config/Config.java
index b7db375..d271ab7 100644
--- a/src/main/java/de/diddiz/LogBlock/config/Config.java
+++ b/src/main/java/de/diddiz/LogBlock/config/Config.java
@@ -1,6 +1,8 @@
 package de.diddiz.LogBlock.config;
 
 import de.diddiz.LogBlock.*;
+import de.diddiz.util.ComparableVersion;
+
 import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.configuration.ConfigurationSection;
@@ -136,6 +138,10 @@ public class Config {
             }
         }
         logblock.saveConfig();
+        
+        ComparableVersion configVersion = new ComparableVersion(config.getString("version"));
+        boolean oldConfig = configVersion.compareTo(new ComparableVersion(logblock.getDescription().getVersion().replace(" (manually compiled)", ""))) < 0;
+        
         url = "jdbc:mysql://" + config.getString("mysql.host") + ":" + config.getInt("mysql.port") + "/" + getStringIncludingInts(config, "mysql.database");
         user = getStringIncludingInts(config, "mysql.user");
         password = getStringIncludingInts(config, "mysql.password");
@@ -166,7 +172,7 @@ public class Config {
             final Material mat = Material.matchMaterial(blocktype);
             if (mat != null) {
                 hiddenBlocks.add(mat);
-            } else {
+            } else if (!oldConfig) {
                 throw new DataFormatException("Not a valid material in hiddenBlocks: '" + blocktype + "'");
             }
         }
@@ -179,7 +185,7 @@ public class Config {
             Material mat = Material.matchMaterial(e);
             if (mat != null) {
                 dontRollback.add(mat);
-            } else {
+            } else if (!oldConfig) {
                 throw new DataFormatException("Not a valid material in dontRollback: '" + e + "'");
             }
         }
@@ -188,7 +194,7 @@ public class Config {
             Material mat = Material.matchMaterial(e);
             if (mat != null) {
                 replaceAnyway.add(mat);
-            } else {
+            } else if (!oldConfig) {
                 throw new DataFormatException("Not a valid material in replaceAnyway: '" + e + "'");
             }
         }
@@ -242,7 +248,7 @@ public class Config {
             throw new DataFormatException("No worlds configured");
         }
         for (final String world : loggedWorlds) {
-            worldConfigs.put(world, new WorldConfig(new File(logblock.getDataFolder(), friendlyWorldname(world) + ".yml")));
+            worldConfigs.put(world, new WorldConfig(world, new File(logblock.getDataFolder(), friendlyWorldname(world) + ".yml")));
         }
         superWorldConfig = new LoggingEnabledMapping();
         for (final WorldConfig wcfg : worldConfigs.values()) {
diff --git a/src/main/java/de/diddiz/LogBlock/config/WorldConfig.java b/src/main/java/de/diddiz/LogBlock/config/WorldConfig.java
index 4a1878b..7b70518 100644
--- a/src/main/java/de/diddiz/LogBlock/config/WorldConfig.java
+++ b/src/main/java/de/diddiz/LogBlock/config/WorldConfig.java
@@ -10,9 +10,11 @@ import java.util.Map;
 import java.util.Map.Entry;
 
 public class WorldConfig extends LoggingEnabledMapping {
+    public final String world;
     public final String table;
 
-    public WorldConfig(File file) throws IOException {
+    public WorldConfig(String world, File file) throws IOException {
+        this.world = world;
         final Map<String, Object> def = new HashMap<String, Object>();
         // "Before MySQL 5.1.6, database and table names cannot contain "/", "\", ".", or characters that are not permitted in file names" - MySQL manual
         // They _can_ contain spaces, but replace them as well