- Fix potential NPE when loading empty cooldowns.json making Towny

unable to load.
TownyAdvanced · Mar 27, 2024 · fc55bf2 · fc55bf2
1 parent 16413ed
commit fc55bf2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Towny/src/main/java/com/palmergames/bukkit/towny/db/TownyFlatFileSource.java b/Towny/src/main/java/com/palmergames/bukkit/towny/db/TownyFlatFileSource.java
@@ -2551,7 +2551,7 @@ public boolean loadCooldowns() {
 			CooldownTimerTask.getCooldowns().putAll(new Gson().fromJson(data, new TypeToken<Map<String, Long>>(){}.getType()));
 		} catch (JsonSyntaxException e) {
 			logger.warn("Could not load saved cooldowns due to a json syntax exception", e);
-		}
+		} catch (NullPointerException ignored) {}
 
 		return true;
 	}

diff --git a/Towny/src/main/resources/ChangeLog.txt b/Towny/src/main/resources/ChangeLog.txt
@@ -9671,4 +9671,5 @@ v0.92.0.11:
     - Requires the towny.command.plot.asmayor permission node.
 0.100.1.24:
   - Fix minimum_amount_of_residents_in_town_for_outpost being used while limit_outposts_using_town_and_nation_levels is also true.
-    - While you limit your outposts by the town/nation levels Towny will ignore any minimum_amount_of_residents_in_town_for_outpost value.
+    - While you limit your outposts by the town/nation levels Towny will ignore any minimum_amount_of_residents_in_town_for_outpost value.
+  - Fix potential NPE when loading empty cooldowns.json making Towny unable to load.