diff --git a/plugins/citadel-paper/src/main/java/vg/civcraft/mc/citadel/command/AreaReinforce.java b/plugins/citadel-paper/src/main/java/vg/civcraft/mc/citadel/command/AreaReinforce.java index 785be6308..655922025 100644 --- a/plugins/citadel-paper/src/main/java/vg/civcraft/mc/citadel/command/AreaReinforce.java +++ b/plugins/citadel-paper/src/main/java/vg/civcraft/mc/citadel/command/AreaReinforce.java @@ -18,11 +18,11 @@ import vg.civcraft.mc.namelayer.group.Group; public class AreaReinforce extends BaseCommand { @CommandAlias("ctar") - @Syntax(" ") + @Syntax(" ") @Description("Using the reinforcement item in your main hand, reinforces an area to your default or a target group.") - @CommandCompletion("@CT_Groups @nothing @nothing @nothing @nothing @nothing @nothing") + @CommandCompletion("@CT_Groups @nothing @nothing @nothing @nothing @nothing @nothing true") @CommandPermission("citadel.admin") - public void execute(Player p, @Optional String targetGroup, String minX, String minY, String minZ, String maxX, String maxY, String maxZ) { + public void execute(Player p, @Optional String targetGroup, String minX, String minY, String minZ, String maxX, String maxY, String maxZ, @Optional String skipReinforcements) { UUID uuid = NameAPI.getUUID(p.getName()); ReinforcementType reinType = Citadel.getInstance().getReinforcementTypeManager() .getByItemStack(p.getInventory().getItemInMainHand(), p.getWorld().getName()); @@ -65,6 +65,7 @@ public class AreaReinforce extends BaseCommand { CitadelUtility.sendAndLog(p, ChatColor.RED, "One of the arguments you provided was not a number"); return; } + boolean skipReins = skipReinforcements.equalsIgnoreCase("true"); int count = 0; for (int x = xMin; x <= xMax; x++) { for (int y = yMin; y <= yMax; y++) { @@ -73,6 +74,12 @@ public class AreaReinforce extends BaseCommand { if (!reinType.canBeReinforced(current.getType())) { continue; } + Reinforcement reinforcement = ReinforcementLogic.getReinforcementAt(current.getLocation()); + if (reinforcement != null) { + if (skipReins) { + continue; + } + } Block protecting = ReinforcementLogic.getResponsibleBlock(current); if (!current.getLocation().equals(protecting.getLocation())) { continue;