diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdAdmin.java b/src/main/java/com/massivecraft/factions/cmd/CmdAdmin.java index 0001de8a..21718cb9 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdAdmin.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdAdmin.java @@ -86,24 +86,20 @@ public class CmdAdmin extends FCommand { FactionsPlugin.instance.getFlogManager().log(targetFaction, FLogType.RANK_EDIT, context.fPlayer.getName(), fyou.getName(), ChatColor.RED + "Admin"); // Inform all players - for (FPlayer fplayer : FPlayers.getInstance().getOnlinePlayers()) { - fplayer.msg(TL.COMMAND_ADMIN_PROMOTED, - context.player == null ? TL.GENERIC_SERVERADMIN.toString() : context.fPlayer.describeTo(fplayer, true), - fyou.describeTo(fplayer), targetFaction.describeTo(fplayer)); + if(FactionsPlugin.instance.getConfig().getBoolean("faction-leader-broadcast")) { + for (FPlayer fplayer : FPlayers.getInstance().getOnlinePlayers()) { + fplayer.msg(TL.COMMAND_ADMIN_PROMOTED, context.player == null ? TL.GENERIC_SERVERADMIN.toString() : context.fPlayer.describeTo(fplayer, true), fyou.describeTo(fplayer), targetFaction.describeTo(fplayer)); + } } }); } private void setRole(FPlayer fp, Role r) { - FactionsPlugin.getInstance().getServer().getScheduler().runTask(FactionsPlugin.instance, () -> { - fp.setRole(r); - }); + FactionsPlugin.getInstance().getServer().getScheduler().runTask(FactionsPlugin.instance, () -> fp.setRole(r)); } private void promoteNewLeader(Faction f) { - FactionsPlugin.getInstance().getServer().getScheduler().runTask(FactionsPlugin.instance, () -> { - f.promoteNewLeader(); - }); + FactionsPlugin.getInstance().getServer().getScheduler().runTask(FactionsPlugin.instance, (Runnable) f::promoteNewLeader); } public TL getUsageTranslation() { diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index e05070d3..3af2c1ef 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -600,6 +600,7 @@ fwarp-gui: faction-creation-broadcast: true #Disabling this will not make faction creation broadcasts appear in chat. faction-disband-broadcast: true #Disabling this will not make faction disband broadcasts appear in chat. faction-open-broadcast: true #Disabling this will not make faction open broadcasts appear in chat. +faction-leader-broadcast: true #Disabling this will not make leader changes appear in chat. ############################################################ # +------------------------------------------------------+ #