#948 Better ChunkyBorder checker

Author: eccentricdevotion

src/main/java/me/eccentric_nz/TARDIS/utility/protection/TARDISChunkyChecker.java

@@ -17,11 +17,17 @@
 package me.eccentric_nz.TARDIS.utility.protection;
 
 import me.eccentric_nz.TARDIS.TARDIS;
+import org.bukkit.entity.Player;
 import org.popcraft.chunky.platform.BukkitPlayer;
 import org.popcraft.chunky.platform.BukkitWorld;
 import org.popcraft.chunky.platform.util.Location;
+import org.popcraft.chunky.shape.Shape;
+import org.popcraft.chunkyborder.BorderData;
 import org.popcraft.chunkyborder.ChunkyBorder;
 import org.popcraft.chunkyborder.event.server.BlockPlaceEvent;
+
+import java.util.Optional;
+
 /**
  * The TARDIS grants its passengers the ability to understand and speak other languages. This is due to the TARDIS's
  * telepathic field.
@@ -43,16 +49,20 @@ public TARDISChunkyChecker(TARDIS plugin) {
      * @param l the location to check.
      * @return true or false depending on whether the location is outside the border
      */
-    public boolean isOutsideBorder(org.bukkit.entity.Player p, org.bukkit.Location l) {
+    public boolean isOutsideBorder(Player p, org.bukkit.Location l) {
         boolean bool = false;
         if (chunky != null) {
-            final BukkitWorld world = new BukkitWorld(l.getWorld());
-            final Location location = new Location(world, l.getX(), l.getY(), l.getZ());
-            final BukkitPlayer player = new BukkitPlayer(p);
-            final BlockPlaceEvent blockPlaceEvent = new BlockPlaceEvent(player, location);
-            chunky.getChunky().getEventBus().call(blockPlaceEvent);
-            if (blockPlaceEvent.isCancelled()) {
-                return true;
+            Optional<BorderData> borderData = chunky.getBorder(l.getWorld().getName());
+            if (borderData.isPresent()) {
+                Shape border = borderData.get().getBorder();
+                bool = !border.isBounding(l.getX(), l.getZ());
+            } else {
+                final BukkitWorld world = new BukkitWorld(l.getWorld());
+                final Location location = new Location(world, l.getX(), l.getY(), l.getZ());
+                final BukkitPlayer player = new BukkitPlayer(p);
+                final BlockPlaceEvent blockPlaceEvent = new BlockPlaceEvent(player, location);
+                chunky.getChunky().getEventBus().call(blockPlaceEvent);
+                bool = blockPlaceEvent.isCancelled();
             }
         }
         return bool;

todo.md

@@ -2,7 +2,7 @@
 
 | Priority | Feature                                                                                                                                                                                                                    | Link |
 |----------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------|
-| ![Static Badge](https://img.shields.io/badge/WIP-f90?style=flat-square) | **Update to 1.21.10**<br/>- Update resource pack - fix sonic generator buttons<br/>- Use new Mannequin api?<br/>- Add new blocks to appropriate rooms e.g. firefly bush to Mangrove, dry grass to Iistabul?<br/>- Related to above - [#902](https://github.com/eccentricdevotion/TARDIS/issues/902) Room updates | [#902](https://github.com/eccentricdevotion/TARDIS/issues/902) |
+| ![Static Badge](https://img.shields.io/badge/WIP-f90?style=flat-square) | **Update to 1.21.10**<br/>- Use new Mannequin api?<br/>- Add new blocks to appropriate rooms e.g. firefly bush to Mangrove, dry grass to Iistabul?<br/>- Related to above - [#902](https://github.com/eccentricdevotion/TARDIS/issues/902) Room updates | [#902](https://github.com/eccentricdevotion/TARDIS/issues/902) |
 | ![Static Badge](https://img.shields.io/badge/WIP-f90?style=flat-square) | **Fix bugs**<br/>!                                                                                                                                                                                                         | - |
 | ![Static Badge](https://img.shields.io/badge/1-f00?style=flat-square) | **Time Rotors and 3D Console Improvements**<br/>- Implement custom modelled consoles<br/>- Rotor/Console menu GUI<br/>- Change rotor placement in item frames<br/>- Additional models for cloister and off states          | [#916](https://github.com/eccentricdevotion/TARDIS/issues/916) |
 | ![Static Badge](https://img.shields.io/badge/1-f00?style=flat-square) | **Modelled controls**<br/>- Console lamp done                                                                                                                                                                              | [#836](https://github.com/eccentricdevotion/TARDIS/issues/836) |