From 2ce9e1d1873bba37bc4a348e5146f9483bbb2eb7 Mon Sep 17 00:00:00 2001
From: Brianna O'Keefe <bri@songoda.com>
Date: Tue, 29 Jan 2019 18:58:44 -0500
Subject: [PATCH] Removed limitation blocking pistons from being placed at the
 border of an island. Fixed issue with pistons being able to push outside of
 the island border.

---
 .../goodandevil/skyblock/listeners/Block.java | 34 +++++++++++++++----
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/src/main/java/me/goodandevil/skyblock/listeners/Block.java b/src/main/java/me/goodandevil/skyblock/listeners/Block.java
index bcaa77b2..96ede4c9 100644
--- a/src/main/java/me/goodandevil/skyblock/listeners/Block.java
+++ b/src/main/java/me/goodandevil/skyblock/listeners/Block.java
@@ -150,13 +150,7 @@ public class Block implements Listener {
         FileConfiguration configLoad = config.getFileConfiguration();
 
         if (configLoad.getBoolean("Island.WorldBorder.Block")) {
-            if (block.getType() == Materials.PISTON.parseMaterial()
-                    || block.getType() == Materials.STICKY_PISTON.parseMaterial()) {
-                if (!LocationUtil.isLocationAtLocationRadius(block.getLocation(),
-                        island.getLocation(world, IslandEnvironment.Island), island.getRadius() - 12.0D)) {
-                    event.setCancelled(true);
-                }
-            } else if (block.getType() == Material.DISPENSER) {
+            if (block.getType() == Material.DISPENSER) {
                 if (!LocationUtil.isLocationAtLocationRadius(block.getLocation(),
                         island.getLocation(world, IslandEnvironment.Island), island.getRadius() - 2.0D)) {
                     event.setCancelled(true);
@@ -194,6 +188,19 @@ public class Block implements Listener {
     public void onBlockPistonExtend(BlockPistonExtendEvent event) {
         if (!skyblock.getWorldManager().isIslandWorld(event.getBlock().getWorld())) return;
 
+        IslandManager islandManager = skyblock.getIslandManager();
+        WorldManager worldManager = skyblock.getWorldManager();
+
+        Island island = islandManager.getIslandAtLocation(event.getBlock().getLocation());
+        IslandWorld world = worldManager.getIslandWorld(event.getBlock().getWorld());
+
+        for (org.bukkit.block.Block block : event.getBlocks()) {
+            if (!LocationUtil.isLocationAtLocationRadius(block.getLocation(),
+                    island.getLocation(world, IslandEnvironment.Island), island.getRadius() - 2.0D)) {
+                event.setCancelled(true);
+            }
+        }
+
         if (!skyblock.getFileManager().getConfig(new File(skyblock.getDataFolder(), "config.yml"))
                 .getFileConfiguration().getBoolean("Island.Block.Piston.Connected.Extend")) {
             for (org.bukkit.block.Block blockList : event.getBlocks()) {
@@ -211,6 +218,19 @@ public class Block implements Listener {
     public void onBlockPistonRetract(BlockPistonRetractEvent event) {
         if (!skyblock.getWorldManager().isIslandWorld(event.getBlock().getWorld())) return;
 
+        IslandManager islandManager = skyblock.getIslandManager();
+        WorldManager worldManager = skyblock.getWorldManager();
+
+        Island island = islandManager.getIslandAtLocation(event.getBlock().getLocation());
+        IslandWorld world = worldManager.getIslandWorld(event.getBlock().getWorld());
+
+        for (org.bukkit.block.Block block : event.getBlocks()) {
+            if (!LocationUtil.isLocationAtLocationRadius(block.getLocation(),
+                    island.getLocation(world, IslandEnvironment.Island), island.getRadius() - 2.0D)) {
+                event.setCancelled(true);
+            }
+        }
+
         if (!skyblock.getFileManager().getConfig(new File(skyblock.getDataFolder(), "config.yml"))
                 .getFileConfiguration().getBoolean("Island.Block.Piston.Connected.Retract")) {
             for (org.bukkit.block.Block blockList : event.getBlocks()) {