From 1cf2158021e2f8de79fe815befcab9c3a8f1a058 Mon Sep 17 00:00:00 2001 From: drtshock Date: Wed, 2 Dec 2015 16:26:06 -0800 Subject: [PATCH] Add option to reset powerboost from #572. Functionality is now /f powerboost p 0 or reset to set the powerboost to 0 for that player or faction. --- .../factions/cmd/CmdPowerBoost.java | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdPowerBoost.java b/src/main/java/com/massivecraft/factions/cmd/CmdPowerBoost.java index 2ae72e73..c50c0de2 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdPowerBoost.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdPowerBoost.java @@ -14,7 +14,7 @@ public class CmdPowerBoost extends FCommand { this.requiredArgs.add("p|f|player|faction"); this.requiredArgs.add("name"); - this.requiredArgs.add("#"); + this.requiredArgs.add("# or reset"); this.permission = Permission.POWERBOOST.node; this.disableOnLock = true; @@ -39,8 +39,12 @@ public class CmdPowerBoost extends FCommand { Double targetPower = this.argAsDouble(2); if (targetPower == null) { - msg(TL.COMMAND_POWERBOOST_INVALIDNUM); - return; + if (this.argAsString(2).equalsIgnoreCase("reset")) { + targetPower = 0D; + } else { + msg(TL.COMMAND_POWERBOOST_INVALIDNUM); + return; + } } String target; @@ -51,7 +55,9 @@ public class CmdPowerBoost extends FCommand { return; } - targetPower += targetPlayer.getPowerBoost(); + if (targetPower != 0) { + targetPower += targetPlayer.getPowerBoost(); + } targetPlayer.setPowerBoost(targetPower); target = TL.COMMAND_POWERBOOST_PLAYER.format(targetPlayer.getName()); } else { @@ -60,7 +66,9 @@ public class CmdPowerBoost extends FCommand { return; } - targetPower += targetFaction.getPowerBoost(); + if (targetPower != 0) { + targetPower += targetFaction.getPowerBoost(); + } targetFaction.setPowerBoost(targetPower); target = TL.COMMAND_POWERBOOST_FACTION.format(targetFaction.getTag()); }