From 193a4acc8342f7796ddc9e4d2ed1fa269593176a Mon Sep 17 00:00:00 2001 From: Magnus Ulf Date: Mon, 20 May 2019 17:50:47 +0200 Subject: [PATCH] Show the money convert command --- .../factions/cmd/CmdFactionsMoneyconvert.java | 6 +++--- src/com/massivecraft/factions/entity/MConf.java | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsMoneyconvert.java b/src/com/massivecraft/factions/cmd/CmdFactionsMoneyconvert.java index 3d204782..dfb7f050 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsMoneyconvert.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsMoneyconvert.java @@ -31,8 +31,8 @@ public class CmdFactionsMoneyconvert extends FactionsCommand @Override public Visibility getVisibility() { - return Visibility.INVISIBLE; - //return MConf.get().useNewMoneySystem ? Visibility.INVISIBLE : Visibility.SECRET; + //return Visibility.INVISIBLE; + return MConf.get().useNewMoneySystem ? Visibility.INVISIBLE : Visibility.SECRET; } @Override @@ -51,7 +51,7 @@ public class CmdFactionsMoneyconvert extends FactionsCommand " This command allows to convert to the new system where the money of a Faction" + " is stored within the Factions plugin. Then all economy plugins can be used with Factions."); } - String confirmationString = this.readArg(null); + ConfirmationUtil.tryConfirm(this); MConf.get().useNewMoneySystem = true; diff --git a/src/com/massivecraft/factions/entity/MConf.java b/src/com/massivecraft/factions/entity/MConf.java index 583c45f4..d93d3cc3 100644 --- a/src/com/massivecraft/factions/entity/MConf.java +++ b/src/com/massivecraft/factions/entity/MConf.java @@ -237,9 +237,13 @@ public class MConf extends Entity // -------------------------------------------- // public boolean protectionLiquidFlowEnabled = true; + + // Protects the faction land from piston extending/retracting + // through the denying of MPerm build + public boolean handlePistonProtectionThroughDenyBuild = true; // -------------------------------------------- // - // HOMES + // WARPS // -------------------------------------------- // // Is the warps feature enabled? @@ -313,10 +317,6 @@ public class MConf extends Entity // Inside your own faction territory you take less damage. // 0.1 means that you take 10% less damage at home. public double territoryShieldFactor = 0.1D; - - // Protects the faction land from piston extending/retracting - // through the denying of MPerm build - public boolean handlePistonProtectionThroughDenyBuild = true; // Make faction disbanding a confirmation thing public boolean requireConfirmationForFactionDisbanding = true;