Added the ability to use the {player} placeholder for the minimum and…

… maximum y values in the config, to allow breaking of all the blocks above or below the player's y-level for example.
biscuut · Nov 12, 2018 · 76adcb4 · 76adcb4
1 parent 5ae94e2
commit 76adcb4
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 6 deletions.
diff --git a/src/main/java/xyz/biscut/chunkbuster/utils/ConfigValues.java b/src/main/java/xyz/biscut/chunkbuster/utils/ConfigValues.java
@@ -367,12 +367,30 @@ public boolean showUpdateMessage() {
         return main.getConfig().getBoolean("show-update-messages");
     }
 
-    public int getMinimumY() {
-        return main.getConfig().getInt("minimum-y");
+    public int getMinimumY(Player p) {
+        if (main.getConfig().getString("minimum-y").toLowerCase().contains("{player}")) {
+            return (int)p.getLocation().getY();
+        } else {
+            try {
+                return Integer.valueOf(main.getConfig().getString("minimum-y"));
+            } catch (NumberFormatException ex) {
+                main.getLogger().warning("Your minimum-y value is invalid, please either change this to an integer or '{player}' in the config.");
+                return 0;
+            }
+        }
     }
 
-    public int getMaximumY() {
-        return main.getConfig().getInt("maximum-y");
+    public int getMaximumY(Player p) {
+        if (main.getConfig().getString("maximum-y").toLowerCase().contains("{player}")) {
+            return (int)p.getLocation().getY();
+        } else {
+            try {
+                return Integer.valueOf(main.getConfig().getString("maximum-y"));
+            } catch (NumberFormatException ex) {
+                main.getLogger().warning("Your maximum-y value is invalid, please either change this to an integer or '{player}' in the config.");
+                return 255;
+            }
+        }
     }
 
     public double getConfigVersion() {

diff --git a/src/main/java/xyz/biscut/chunkbuster/utils/Utils.java b/src/main/java/xyz/biscut/chunkbuster/utils/Utils.java
@@ -44,7 +44,7 @@ public void clearChunks(int chunkBusterArea, Location chunkBusterLocation, Playe
         if (chunkBusterArea == 1) {
             RemovalQueue removalQueue = new RemovalQueue(main);
             waterChunks.add(chunkBusterLocation.getChunk());
-            for (int y = main.getConfigValues().getMaximumY(); y >= main.getConfigValues().getMinimumY(); y--) {
+            for (int y = main.getConfigValues().getMaximumY(p); y >= main.getConfigValues().getMinimumY(p); y--) {
                 for (int x = 0; x < 16; x++) {
                     for (int z = 0; z < 16; z++) {
                         Block b = chunkBusterLocation.getChunk().getBlock(x, y, z);
@@ -64,7 +64,7 @@ public void clearChunks(int chunkBusterArea, Location chunkBusterLocation, Playe
             int lowerSearchBound = (chunkBusterArea - 1) / -2;
             int startingX = chunkBusterLocation.getChunk().getX();
             int startingZ = chunkBusterLocation.getChunk().getZ();
-            for (int y = main.getConfigValues().getMaximumY(); y >= main.getConfigValues().getMinimumY(); y--) {
+            for (int y = main.getConfigValues().getMaximumY(p); y >= main.getConfigValues().getMinimumY(p); y--) {
                 for (int chunkX = lowerSearchBound; chunkX < upperSearchBound; chunkX++) {
                     for (int chunkZ = lowerSearchBound; chunkZ < upperSearchBound; chunkZ++) {
                         Chunk chunk = chunkBusterLocation.getWorld().getChunkAt(startingX + chunkX, startingZ + chunkZ);

diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
@@ -33,6 +33,7 @@ can-place-in-wilderness: true
 cooldown: 0
 
 # Chunkbusters clear between this minimum value and the maximum value (both inclusive). 0 and 255 means the whole chunk.
+# You can use '{player}' for the player's Y-coordinate.
 minimum-y: 0
 maximum-y: 255