- Fix regression from 0.98.1.1 causing java.lang.NullPointerException

on load.
TownyAdvanced · Mar 19, 2022 · 79890d1 · 79890d1
1 parent e56a9dc
commit 79890d1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/resources/ChangeLog.txt b/resources/ChangeLog.txt
@@ -7352,4 +7352,5 @@ v0.92.0.11:
   - Bump language files to 0.146.
   - Fix water being able to be placed in waterloggable blocks on plot borders, courtesy of Warriorrrr with PR #5736.
 0.98.1.2:
-  - Fix outpost spawns being able to be made in other towns in rare conditions. 
+  - Fix outpost spawns being able to be made in other towns in rare conditions. 
+  - Fix regression from 0.98.1.1 causing java.lang.NullPointerException on load.
diff --git a/src/com/palmergames/bukkit/config/migration/ConfigMigrator.java b/src/com/palmergames/bukkit/config/migration/ConfigMigrator.java
@@ -4,9 +4,9 @@
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
 import com.palmergames.bukkit.config.CommentedConfiguration;
+import com.palmergames.bukkit.config.ConfigNodes;
 import com.palmergames.bukkit.towny.Towny;
 import com.palmergames.bukkit.towny.TownyMessaging;
-import com.palmergames.bukkit.towny.TownySettings;
 import com.palmergames.bukkit.towny.TownyUniverse;
 import com.palmergames.bukkit.towny.object.TownyWorld;
 import com.palmergames.bukkit.towny.permissions.TownyPerms;
@@ -46,7 +46,7 @@ public ConfigMigrator(@NotNull CommentedConfiguration config, @NotNull String fi
 		this.townyperms = TownyPerms.getTownyPermsFile();
 		this.earlyRun = earlyRun;
 		this.plugin = Towny.getPlugin();
-		this.lastRunVersion = Version.fromString(TownySettings.getLastRunVersion());
+		this.lastRunVersion = Version.fromString(config.getString(ConfigNodes.LAST_RUN_VERSION.getRoot(), "0.0.0.0"));
 	}
 
 	/**