Added worldborder support

Author: biscuut

ChunkBusterPlugin/pom.xml

@@ -9,7 +9,7 @@
     <artifactId>ChunkBusterPlugin</artifactId>
     <packaging>jar</packaging>
     <name>ChunkBusterPlugin</name>
-    <version>1.2.6</version>
+    <version>1.2.7</version>
 
     <repositories>
         <repository>

ChunkBusterPlugin/src/main/java/codes/biscuit/chunkbuster/utils/ConfigValues.java

@@ -229,6 +229,10 @@ public boolean coreprotectHookEnabled() {
         return main.getConfig().getBoolean("hooks.coreprotect");
     }
 
+    boolean worldborderHookEnabled() {
+        return main.getConfig().getBoolean("hooks.worldborder");
+    }
+
     public boolean worldguardHookEnabled() {
         return main.getConfig().getBoolean("hooks.worldguard");
     }

ChunkBusterPlugin/src/main/java/codes/biscuit/chunkbuster/utils/Utils.java

@@ -5,9 +5,7 @@
 import net.md_5.bungee.api.ChatColor;
 import net.md_5.bungee.api.chat.ClickEvent;
 import net.md_5.bungee.api.chat.TextComponent;
-import org.bukkit.Chunk;
-import org.bukkit.Location;
-import org.bukkit.Material;
+import org.bukkit.*;
 import org.bukkit.block.Block;
 import org.bukkit.command.CommandSender;
 import org.bukkit.enchantments.Enchantment;
@@ -84,6 +82,7 @@ public void clearChunks(int chunkBusterArea, Location chunkBusterLocation, Playe
         Set<Material> ignoredBlocks = main.getConfigValues().getIgnoredBlocks();
         if (chunkBusterArea % 2 != 0) {
             RemovalQueue removalQueue = new RemovalQueue(main, p);
+            WorldBorder border = chunkBusterLocation.getWorld().getWorldBorder();
             // Variables for the area to loop through
             int upperBound = ((chunkBusterArea-1)/2)+1;
             int lowerBound = (chunkBusterArea-1)/-2;
@@ -98,7 +97,9 @@ public void clearChunks(int chunkBusterArea, Location chunkBusterLocation, Playe
                                 for (int z = 0; z < 16; z++) {
                                     Block b = chunk.getBlock(x, y, z);
                                     if (!b.getType().equals(Material.AIR) && !ignoredBlocks.contains(b.getType())) {
-                                        removalQueue.getBlocks().add(b);
+                                        if (!main.getConfigValues().worldborderHookEnabled() || insideBorder(b, border)) {
+                                            removalQueue.getBlocks().add(b);
+                                        }
                                     }
                                 }
                             }
@@ -113,8 +114,17 @@ public void clearChunks(int chunkBusterArea, Location chunkBusterLocation, Playe
         }
     }
 
+    private boolean insideBorder(Block block, WorldBorder border) {
+        Location blockLocation = block.getLocation().add(0.5, 0, 0.5);
+        double x = blockLocation.getX();
+        double z = blockLocation.getZ();
+        double size = border.getSize()/2;
+        Location center = border.getCenter();
+        return !((x >= center.clone().add(size, 0, 0).getX() || z >= center.clone().add(0, 0, size).getZ()) || (x <= center.clone().subtract(size,0,0).getX() || (z <= center.clone().subtract(0,0, size).getZ())));
+    }
+
     public void updateConfig(ChunkBuster main) { // Basic config updater that saves the old config, loads the new one, and inserts the old keys
-        if (main.getConfigValues().getConfigVersion() < 2.1) {
+        if (main.getConfigValues().getConfigVersion() < 2.2) {
             Map<String, Object> oldValues = new HashMap<>();
             for (String oldKey : main.getConfig().getKeys(true)) {
                 oldValues.put(oldKey, main.getConfig().get(oldKey));
@@ -126,7 +136,7 @@ public void updateConfig(ChunkBuster main) { // Basic config updater that saves
                     main.getConfig().set(newKey, oldValues.get(newKey));
                 }
             }
-            main.getConfig().set("config-version", 2.1);
+            main.getConfig().set("config-version", 2.2);
             main.saveConfig();
         }
     }

ChunkBusterPlugin/src/main/resources/config.yml

@@ -120,6 +120,7 @@ hooks:
   coreprotect: false # Whether CoreProtect should log all removed blocks or not. Will have no effect if coreprotect is not installed.
   worldguard: true # Check for block-break flag in regions
   towny: false # Check land build permissions
+  worldborder: true # Check for the worldborder, may or may not be a tiny bit slower
 
 # The minimum factions role for using chunkbusters
 # For FactionsUUID/SavageFactions, set this to either "leader"/"admin", "coleader", "moderator", "member"/"normal", "recruit"/"any"
@@ -131,4 +132,4 @@ minimum-factions-role: "any"
 show-update-messages: true
 
 # Please do not edit :)
-config-version: 2.1
+config-version: 2.2