- Fix the town-is-deleted message being shown twice.

TownyAdvanced · Oct 27, 2023 · 439af91 · 439af91
1 parent 364e3d3
commit 439af91
Show file tree

Hide file tree

Showing 4 changed files with 10 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.0</version>
+    <version>0.100.0.1</version>
 
     <licenses>
         <license>

diff --git a/Towny/src/main/java/com/palmergames/bukkit/towny/db/TownyDatabaseHandler.java b/Towny/src/main/java/com/palmergames/bukkit/towny/db/TownyDatabaseHandler.java
@@ -427,7 +427,7 @@ public void removeTown(Town town, boolean delayFullRemoval) {
 
 		for (Resident resident : toSave) {
 			resident.clearModes();
-			resident.removeTown();
+			resident.removeTown(true);
 		}
 
 		// Look for residents inside of this town's jail(s) and free them, more than 

diff --git a/Towny/src/main/java/com/palmergames/bukkit/towny/object/Resident.java b/Towny/src/main/java/com/palmergames/bukkit/towny/object/Resident.java
@@ -296,7 +296,10 @@ public void setTown(Town town, boolean updateJoinedAt) throws AlreadyRegisteredE
 	}
 
 	public void removeTown() {
-
+		removeTown(false);
+	}
+
+	public void removeTown(boolean townDeleted) {
 		if (!hasTown())
 			return;
 
@@ -324,7 +327,7 @@ public void removeTown() {
 		try {
 			town.removeResident(this);
 		} catch (EmptyTownException e) {
-			if (town.exists())
+			if (!townDeleted)
 				TownyUniverse.getInstance().getDataSource().removeTown(town, false);
 		} catch (NotRegisteredException ignored) {}
 

diff --git a/Towny/src/main/resources/ChangeLog.txt b/Towny/src/main/resources/ChangeLog.txt
@@ -9171,4 +9171,6 @@ v0.92.0.11:
 0.99.6.5:
   - Add a listener which will reset the player cache when they are inside of a plot or town which has had their plot permissions change.
 0.100.0.0:
-  - Bump version for release.
+  - Bump version for release.
+0.100.0.1:
+  - Fix the town-is-deleted message being shown twice.