CivMC/Civ
1
0
Fork 0
mirror of https://github.com/CivMC/Civ.git synced 2026-07-18 00:20:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #353 from Diet-Cola/ctar-improvement

Browse Source 
Add skip existing reinforcements flag to ctar
This commit is contained in:
RedDevel2
2024-03-05 19:14:24 +01:00
committed by GitHub
parent de2a6deb65 ae5321c21f
commit 893fa74373
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/citadel-paper/src/main/java/vg/civcraft/mc/citadel/command/AreaReinforce.java
View File

@@ -18,11 +18,11 @@ import vg.civcraft.mc.namelayer.group.Group;
public class AreaReinforce extends BaseCommand {
@CommandAlias("ctar")
@Syntax("<group> <lowX> <lowY> <lowZ> <highX> <highY> <highZ>")
@Syntax("<group> <lowX> <lowY> <lowZ> <highX> <highY> <highZ> <skip_existing_reinforcements>")
@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;