Merge branch 'master' into backport/0.96.0.0

TownyAdvanced · Jan 31, 2020 · 24002eb · 24002eb
2 parents 417168e + e24129c
commit 24002eb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/resources/ChangeLog.txt b/resources/ChangeLog.txt
@@ -4124,10 +4124,12 @@ v0.92.0.11:
     - Allows the use of the /ta nation new {name} {capital} command.
   - Pom updates for javadocs courtesy of FlagCourier with PR #3672.
   - Eco backend refactor courtesy of Siris with PR #3663.
-
+0.95.2.14:
+  - Fix for revoking town invites on a player not actually revoking the invite.
+
 0.96.0.0:
   - Special 'Testing' Release for 1.13.2 Servers preceding 0.96.0.0
     - Some "Required Config Changes" will not be necessary for this release.
     - Reverted ProtectionRegenTask class to previous version found in 1.13 branch (API Incompatibility)
       - This may result in run-time bugs! I am not familiar with this class, or the methods that call it.
-    - Changed to full-path import for ActionType in TownyPlayerListener.
+    - Changed to full-path import for ActionType in TownyPlayerListener.
diff --git a/src/com/palmergames/bukkit/towny/command/TownCommand.java b/src/com/palmergames/bukkit/towny/command/TownCommand.java
@@ -2760,7 +2760,7 @@ public static void townAdd(Object sender, Town specifiedTown, String[] names) th
 		String[] namestoremove = removeinvites.toArray(new String[0]);
 		if (namestoremove.length != 0) {
 			List<Resident> toRevoke = getValidatedResidentsForInviteRevoke(sender, namestoremove, town);
-			if (toRevoke.isEmpty())
+			if (!toRevoke.isEmpty())
 				townRevokeInviteResident(sender,town, toRevoke);
 		}