Fix #1053 NPE when loading with old configs

ForestryMC · Feb 2, 2016 · bbd39ea · bbd39ea
1 parent 6265c01
commit bbd39ea
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -2,4 +2,4 @@ mcversion=1.7.10
 forgeversion=10.13.4.1566-1.7.10
 version_major=4
 version_minor=2
-version_patch=6
+version_patch=7
diff --git a/src/main/java/forestry/plugins/PluginApiculture.java b/src/main/java/forestry/plugins/PluginApiculture.java
@@ -17,6 +17,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Random;
 import java.util.Set;
 
@@ -213,7 +214,7 @@ public void doInit() {
 		}
 
 		LocalizedConfiguration config = new LocalizedConfiguration(configFile, "2.0.0");
-		if (!config.getLoadedConfigVersion().equals(config.getDefinedConfigVersion())) {
+		if (!Objects.equals(config.getLoadedConfigVersion(), config.getDefinedConfigVersion())) {
 			boolean deleted = configFile.delete();
 			if (deleted) {
 				config = new LocalizedConfiguration(configFile, "2.0.0");