Remove two cases of == equality check for residents (#7084)

TownyAdvanced · Nov 14, 2023 · 5605251 · 5605251
1 parent 61268ae
commit 5605251
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/Towny/src/main/java/com/palmergames/bukkit/towny/command/TownCommand.java b/Towny/src/main/java/com/palmergames/bukkit/towny/command/TownCommand.java
@@ -3027,7 +3027,7 @@ public static void townKickResidents(CommandSender sender, Resident resident, To
 				continue;
 			}
 
-			if (resident == member) {
+			if (member.equals(resident)) {
 				TownyMessaging.sendErrorMsg(sender, Translatable.of("msg_you_cannot_kick_yourself"));
 				kicking.remove(member);
 				continue;
@@ -4463,10 +4463,15 @@ private void parseTownBuyTownCommand(CommandSender sender, String[] args) throws
 				}
 
 				Resident currentMayor = town.getMayor();
-				if (currentMayor == resident) {
+				if (resident.equals(currentMayor)) {
 					TownyMessaging.sendErrorMsg(sender, Translatable.of("msg_town_buytown_already_mayor", resident.getTownOrNull().getName()));
 					return;
 				}
+
+				if (resident.isMayor()) {
+					TownyMessaging.sendErrorMsg(sender, Translatable.of("msg_mayor_abandon"));
+					return;
+				}
 
 				if (!resident.getAccount().withdraw(town.getForSalePrice(), "Town purchase cost.")) {
 					TownyMessaging.sendErrorMsg(sender, Translatable.of("msg_err_you_need_x_to_pay", town.getForSalePrice()));