Make worldguard hook check all 4 corners of a chunk instead of just the middle block, fix a bug with the new inventory stuff.

Author: biscuut

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>codes.biscuit</groupId>
     <artifactId>ChunkBuster</artifactId>
-    <version>1.2.1</version>
+    <version>1.2.2</version>
     <name>ChunkBuster</name>
 
     <build>

src/main/java/codes/biscuit/chunkbuster/events/PlayerEvents.java

@@ -136,8 +136,13 @@ public void onConfirmClick(InventoryClickEvent e) {
                                     itemSlot = p.getInventory().getHeldItemSlot();
                                 } else {
                                     for (int i = 0; i <= 40; i++) { // 40 should fix the offhand issue.
-                                        ItemStack currentItem = p.getInventory().getItem(i);
-                                        if (currentItem.getType().equals(main.getConfigValues().getChunkBusterMaterial()) && currentItem.hasItemMeta() && currentItem.getItemMeta().getEnchantLevel(Enchantment.LURE) > 0) {
+                                        ItemStack currentItem;
+                                        try {
+                                            currentItem = p.getInventory().getItem(i);
+                                        } catch (IndexOutOfBoundsException ex) {
+                                            continue;
+                                        }
+                                        if (currentItem != null && currentItem.getType().equals(main.getConfigValues().getChunkBusterMaterial()) && currentItem.hasItemMeta() && currentItem.getItemMeta().getEnchantLevel(Enchantment.LURE) > 0) {
                                             itemSlot = i;
                                             break;
                                         }

src/main/java/codes/biscuit/chunkbuster/hooks/HookUtils.java

@@ -107,7 +107,7 @@ public boolean compareLocToPlayer(Location loc, Player p) {
         }
         if (main.getConfigValues().worldguardHookEnabled() && enabledHooks.containsKey(HookType.WORLDGUARD)) {
             WorldGuardHook worldGuardHook = (WorldGuardHook)enabledHooks.get(HookType.WORLDGUARD);
-            if (!worldGuardHook.checkLocationBreakFlag(loc, p)) canBuild = false;
+            if (!worldGuardHook.checkLocationBreakFlag(loc.getChunk(), p)) canBuild = false;
         }
         if (main.getConfigValues().townyHookEnabled() && enabledHooks.containsKey(HookType.TOWNY)) {
             TownyHook townyHook = (TownyHook)enabledHooks.get(HookType.TOWNY);

src/main/java/codes/biscuit/chunkbuster/hooks/TownyHook.java

@@ -16,7 +16,6 @@ boolean canBuild(Chunk chunk, Player p) {
         } else {
             Block[] cornerBlocks = {chunk.getBlock(0,chunk.getWorld().getMaxHeight()/2, 0), chunk.getBlock(0,chunk.getWorld().getMaxHeight()/2, 15),
                     chunk.getBlock(15,chunk.getWorld().getMaxHeight()/2, 0), chunk.getBlock(15,chunk.getWorld().getMaxHeight()/2, 15)};
-
             for (Block currentBlock : cornerBlocks) {
                 if (!PlayerCacheUtil.getCachePermission(p, currentBlock.getLocation(), currentBlock.getType(), TownyPermission.ActionType.DESTROY)) return false;
             }

src/main/java/codes/biscuit/chunkbuster/hooks/WorldGuardHook.java

@@ -8,17 +8,23 @@
 import com.sk89q.worldguard.protection.flags.DefaultFlag;
 import com.sk89q.worldguard.protection.flags.StateFlag;
 import org.bukkit.Bukkit;
-import org.bukkit.Location;
+import org.bukkit.Chunk;
+import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 
 class WorldGuardHook {
 
-    boolean checkLocationBreakFlag(Location loc, Player p) {
+    boolean checkLocationBreakFlag(Chunk chunk, Player p) {
         WorldGuardPlugin worldGuardPlugin = (WorldGuardPlugin)Bukkit.getServer().getPluginManager().getPlugin("WorldGuard");
         RegionContainer container = worldGuardPlugin.getRegionContainer();
-        RegionQuery query = container.createQuery();
-        ApplicableRegionSet set = query.getApplicableRegions(loc);
-        LocalPlayer localPlayer = worldGuardPlugin.wrapPlayer(p);
-        return !(set.queryState(localPlayer, DefaultFlag.BLOCK_BREAK) == StateFlag.State.DENY); // Block break isn't set to deny
+        Block[] cornerBlocks = {chunk.getBlock(0,chunk.getWorld().getMaxHeight()/2, 0), chunk.getBlock(0,chunk.getWorld().getMaxHeight()/2, 15),
+                chunk.getBlock(15,chunk.getWorld().getMaxHeight()/2, 0), chunk.getBlock(15,chunk.getWorld().getMaxHeight()/2, 15)};
+        for (Block currentBlock : cornerBlocks) {
+            RegionQuery query = container.createQuery();
+            ApplicableRegionSet set = query.getApplicableRegions(currentBlock.getLocation());
+            LocalPlayer localPlayer = worldGuardPlugin.wrapPlayer(p);
+            if (set.queryState(localPlayer, DefaultFlag.BLOCK_BREAK) == StateFlag.State.DENY) return false; // If block break is set to deny
+        }
+        return true;
     }
 }

src/main/resources/config.yml

@@ -105,7 +105,7 @@ messages:
   not-minimum-role: '&cYou must be a faction (insert role) to use chunkbusters.'
   gui-cancel: '&cThe chunkbuster has been cancelled.'
   cooldown: '&cYou must wait {minutes} minute(s) and {seconds} second(s) to use this again!'
-  no-item: 'You must have a chunk buster in your inventory!'
+  no-item: '&cYou must have a chunk buster in your inventory!'
 
 # Blocks that will not get cleared by chunkbusters. Use material enum names.
 ignored-materials: