From f124877dba5aa32580dfce2fc132c0cfcf4107df Mon Sep 17 00:00:00 2001 From: DroppingAnvil Date: Mon, 2 Dec 2019 18:13:13 -0600 Subject: [PATCH] Fixed message issue with lang when promoting a player in a faction to Admin. Signed-off-by: DroppingAnvil --- .../com/massivecraft/factions/zcore/persist/MemoryFaction.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/MemoryFaction.java b/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFaction.java index c69dc8dd..2efdcd6d 100644 --- a/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFaction.java +++ b/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFaction.java @@ -1313,7 +1313,7 @@ public abstract class MemoryFaction implements Faction, EconomyParticipator { oldLeader.setRole(Role.NORMAL); } replacements.get(0).setRole(Role.LEADER); - this.msg(TL.COMMAND_ADMIN_PROMOTED_AUTOLEAVE, oldLeader == null ? "" : oldLeader.getName(), replacements.get(0).getName()); + this.msg(TL.AUTOLEAVE_ADMIN_PROMOTED, oldLeader == null ? "" : oldLeader.getName(), replacements.get(0).getName()); FactionsPlugin.getInstance().log("Faction " + this.getTag() + " (" + this.getId() + ") admin was removed. Replacement admin: " + replacements.get(0).getName()); } } 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 a0c6883e..72b6722a 100644 --- a/src/main/java/com/massivecraft/factions/zcore/util/TL.java +++ b/src/main/java/com/massivecraft/factions/zcore/util/TL.java @@ -143,7 +143,6 @@ public enum TL { COMMAND_ADMIN_DEMOTED("&c&l[!] &cYou have been demoted from the position of faction admin by &7%1$s&c"), COMMAND_ADMIN_PROMOTES("&e&l[!] &eYou have promoted &6%1$s &eto the position of faction admin."), COMMAND_ADMIN_PROMOTED("&e&l[!] &6%1$s &egave &6%2$s ðe leadership of &6%3$s&e."), - COMMAND_ADMIN_PROMOTED_AUTOLEAVE("&e&l[!] &7Faction admin &c%s&7 has been removed. &c%s&7 has been promoted as the new faction admin."), COMMAND_ADMIN_DESCRIPTION("Hand over your admin rights"), COMMAND_ADMIN_NOMEMBERS("&e&l[!] &cNo one else to promote, please disband faction."), @@ -976,6 +975,7 @@ public enum TL { LEAVE_DISBANDED("%s was disbanded."), LEAVE_DISBANDEDLOG("The faction %s (%s) was disbanded due to the last player (%s) leaving."), LEAVE_DESCRIPTION("\\n &a&l» &7Leave your faction"), + AUTOLEAVE_ADMIN_PROMOTED("&e&l[!] &7Faction admin &c%s&7 has been removed. &c%s&7 has been promoted as the new faction admin."), /** * Claiming - Same as above basically. No COMMAND_* because it's not in a command class, but...