- Fix potential IllegalArgumentException by loading sanctioned towns

in a safer way.
EarthMC · Dec 22, 2023 · e82ee03 · e82ee03
1 parent f320915
commit e82ee03
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/Towny/pom.xml b/Towny/pom.xml
@@ -13,7 +13,7 @@
 
     <artifactId>towny</artifactId>
     <packaging>jar</packaging>
-    <version>0.100.0.13</version>
+    <version>0.100.0.14</version>
 
     <licenses>
         <license>

diff --git a/Towny/src/main/java/com/palmergames/bukkit/towny/object/Nation.java b/Towny/src/main/java/com/palmergames/bukkit/towny/object/Nation.java
@@ -725,9 +725,13 @@ public List<String> getSanctionedTownsForSaving() {
 
 	public void loadSanctionedTowns(String[] tokens) {
 		for (String stringUUID : tokens) {
-			UUID uuid = UUID.fromString(stringUUID);
-			if (uuid != null && TownyAPI.getInstance().getTown(uuid) != null)
-				sanctionedTowns.add(TownyAPI.getInstance().getTown(uuid));
+			try {
+				Town town = TownyAPI.getInstance().getTown(UUID.fromString(stringUUID));
+				if (town != null)
+					sanctionedTowns.add(town);
+			} catch (IllegalArgumentException ignored) {
+				continue;
+			}
 		}
 	}
 }
diff --git a/Towny/src/main/resources/ChangeLog.txt b/Towny/src/main/resources/ChangeLog.txt
@@ -9313,4 +9313,6 @@ v0.92.0.11:
   - API: Added NationSanctionTownAddEvent
     - A cancellable event which is fired before a town becomes sanctioned.
   - API: Added NationSanctionTownRemoveEvent
-    - A cancellable event which is fired before a town becomes unsanctioned.
+    - A cancellable event which is fired before a town becomes unsanctioned.
+0.100.0.14:
+  - Fix potential IllegalArgumentException by loading sanctioned towns in a safer way.