From 4dec162d46c59d339d0db0af76faa6fecee9e683 Mon Sep 17 00:00:00 2001 From: Driftay Date: Mon, 23 Mar 2020 16:31:33 -0400 Subject: [PATCH] More Configurability --- src/main/java/com/massivecraft/factions/Conf.java | 6 ++++++ .../java/com/massivecraft/factions/cmd/CmdStealth.java | 8 ++++++++ src/main/java/com/massivecraft/factions/cmd/FCmdRoot.java | 7 ++++++- 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/massivecraft/factions/Conf.java b/src/main/java/com/massivecraft/factions/Conf.java index eb6e9fa8..158eb3a3 100644 --- a/src/main/java/com/massivecraft/factions/Conf.java +++ b/src/main/java/com/massivecraft/factions/Conf.java @@ -111,6 +111,12 @@ public class Conf { //GUI's public static boolean useDisbandGUI = true; + //SEALTH + public static boolean useSealthSystem = true; + + //STRIKES + public static boolean useStrikeSystem = true; + //DISCORD public static boolean useDiscordSystem = false; public static String discordBotToken = ""; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdStealth.java b/src/main/java/com/massivecraft/factions/cmd/CmdStealth.java index 7ec4d12d..a127e971 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdStealth.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdStealth.java @@ -1,5 +1,7 @@ package com.massivecraft.factions.cmd; +import com.massivecraft.factions.Conf; +import com.massivecraft.factions.FactionsPlugin; import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.zcore.util.TL; @@ -19,6 +21,12 @@ public class CmdStealth extends FCommand { @Override public void perform(CommandContext context) { + if (!Conf.useSealthSystem) { + context.msg(TL.GENERIC_DISABLED, "Factions Stealth"); + return; + } + + if (context.faction != null && !context.faction.getId().equalsIgnoreCase("0") && !context.faction.getId().equalsIgnoreCase("none") && !context.faction.getId().equalsIgnoreCase("safezone") && !context.faction.getId().equalsIgnoreCase("warzone")) { context.fPlayer.setStealth(!context.fPlayer.isStealthEnabled()); context.msg(context.fPlayer.isStealthEnabled() ? TL.COMMAND_STEALTH_ENABLE : TL.COMMAND_STEALTH_DISABLE); diff --git a/src/main/java/com/massivecraft/factions/cmd/FCmdRoot.java b/src/main/java/com/massivecraft/factions/cmd/FCmdRoot.java index 0e8c9ab5..53c5e320 100644 --- a/src/main/java/com/massivecraft/factions/cmd/FCmdRoot.java +++ b/src/main/java/com/massivecraft/factions/cmd/FCmdRoot.java @@ -184,6 +184,7 @@ public class FCmdRoot extends FCommand implements CommandExecutor { public Boolean internalFTOPEnabled = false; public Boolean fWildEnabled = false; public Boolean fAuditEnabled = false; + public Boolean fStrikes = false; public FCmdRoot() { super(); @@ -292,7 +293,6 @@ public class FCmdRoot extends FCommand implements CommandExecutor { this.addSubCommand(this.cmdChest); this.addSubCommand(this.cmdSetBanner); this.addSubCommand(this.cmdCorner); - this.addSubCommand(this.cmdStrikes); this.addSubCommand(this.cmdFGlobal); this.addSubCommand(this.cmdViewChest); this.addSubCommand(this.cmdConvertConfig); @@ -355,6 +355,11 @@ public class FCmdRoot extends FCommand implements CommandExecutor { fAuditEnabled = true; } + if(Conf.useStrikeSystem){ + this.addSubCommand(this.cmdStrikes); + fStrikes = true; + } + //Other if (FactionsPlugin.getInstance().getConfig().getBoolean("Wild.Enabled", false) && !fWildEnabled) { this.addSubCommand(this.cmdWild);