From e5b920dfe68ada472eb486eb0c892416706363a6 Mon Sep 17 00:00:00 2001 From: Driftay Date: Fri, 26 Jul 2024 12:35:10 -0400 Subject: [PATCH] Disallowed /f leave whilst last person in faction, must disband --- .../com/massivecraft/factions/zcore/persist/MemoryFPlayer.java | 2 +- src/main/java/com/massivecraft/factions/zcore/util/TL.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFPlayer.java b/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFPlayer.java index a8c1b2343..a163d4770 100644 --- a/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFPlayer.java +++ b/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFPlayer.java @@ -807,7 +807,7 @@ public void leave(boolean makePay) { boolean perm = myFaction.isPermanent(); - if (!perm && this.getRole() == Role.LEADER && myFaction.getFPlayers().size() > 1) { + if (!perm && this.getRole() == Role.LEADER && myFaction.getFPlayers().size() == 1) { msg(TL.LEAVE_PASSADMIN); return; } diff --git a/src/main/java/com/massivecraft/factions/zcore/util/TL.java b/src/main/java/com/massivecraft/factions/zcore/util/TL.java index d26e67308..fcd714dc6 100644 --- a/src/main/java/com/massivecraft/factions/zcore/util/TL.java +++ b/src/main/java/com/massivecraft/factions/zcore/util/TL.java @@ -192,7 +192,7 @@ public enum TL { COMMAND_ALTKICK_NOTMEMBER("&c&l[!] &7This player is not a member of your faction."), COMMAND_ALTS_LIST_NOALTS("&c&l[!] &7%s does not have any alts in their faction!"), - COMMAND_AUTOHELP_HELPFOR("Help for command"), + COMMAND_AUTOHELP_HECOMMAND_LEAVE_LEADER_MESSAGELPFOR("Help for command"), COMMAND_HOME_OTHER_NOTSET("&c&l[!] &7%s does not have their faction home set!"), COMMAND_HOME_TELEPORT_OTHER("&c&l[!] &7You have teleported to %s's faction home!"), COMMAND_SHOP_DESCRIPTION("opens shop gui"),