From 3f88bc1ec703c08dd5e6331013849f32526f2b8c Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 21 Jan 2017 17:06:28 -0600 Subject: [PATCH] Expose WorldBorder@isInBounds(Location) check --- ...orldBorder-isInBounds-Location-check.patch | 28 ++++++++++++++++ ...rldBorder-isInBounds-Location-method.patch | 32 +++++++++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 Spigot-API-Patches/0050-Expose-WorldBorder-isInBounds-Location-check.patch create mode 100644 Spigot-Server-Patches/0208-Expose-WorldBorder-isInBounds-Location-method.patch diff --git a/Spigot-API-Patches/0050-Expose-WorldBorder-isInBounds-Location-check.patch b/Spigot-API-Patches/0050-Expose-WorldBorder-isInBounds-Location-check.patch new file mode 100644 index 0000000000..61b8625cdc --- /dev/null +++ b/Spigot-API-Patches/0050-Expose-WorldBorder-isInBounds-Location-check.patch @@ -0,0 +1,28 @@ +From 2929553345386ced98bef0739339bed732757880 Mon Sep 17 00:00:00 2001 +From: Zach Brown +Date: Sat, 21 Jan 2017 17:03:10 -0600 +Subject: [PATCH] Expose WorldBorder#isInBounds(Location) check + + +diff --git a/src/main/java/org/bukkit/WorldBorder.java b/src/main/java/org/bukkit/WorldBorder.java +index 55c8983b..1957507c 100644 +--- a/src/main/java/org/bukkit/WorldBorder.java ++++ b/src/main/java/org/bukkit/WorldBorder.java +@@ -106,4 +106,14 @@ public interface WorldBorder { + * @param distance The distance in blocks. (The default is 5 blocks.) + */ + public void setWarningDistance(int distance); ++ ++ // Paper start ++ /** ++ * Checks if the location is within the boundaries of this border. ++ * ++ * @param location specific location to check ++ * @return true if the location is within the bounds of this border, false otherwise. ++ */ ++ public boolean isInBounds(Location location); ++ // Paper end + } +-- +2.11.0.windows.3 + diff --git a/Spigot-Server-Patches/0208-Expose-WorldBorder-isInBounds-Location-method.patch b/Spigot-Server-Patches/0208-Expose-WorldBorder-isInBounds-Location-method.patch new file mode 100644 index 0000000000..83b73fce8a --- /dev/null +++ b/Spigot-Server-Patches/0208-Expose-WorldBorder-isInBounds-Location-method.patch @@ -0,0 +1,32 @@ +From c6e95d2264c36e04739c97f4e9eb9663e661cbdf Mon Sep 17 00:00:00 2001 +From: Zach Brown +Date: Sat, 21 Jan 2017 16:58:09 -0600 +Subject: [PATCH] Expose WorldBorder#isInBounds(Location) method + + +diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorldBorder.java b/src/main/java/org/bukkit/craftbukkit/CraftWorldBorder.java +index e5395a1cc..d2b095e91 100644 +--- a/src/main/java/org/bukkit/craftbukkit/CraftWorldBorder.java ++++ b/src/main/java/org/bukkit/craftbukkit/CraftWorldBorder.java +@@ -1,5 +1,6 @@ + package org.bukkit.craftbukkit; + ++import net.minecraft.server.BlockPosition; + import org.bukkit.Location; + import org.bukkit.World; + import org.bukkit.WorldBorder; +@@ -108,4 +109,11 @@ public class CraftWorldBorder implements WorldBorder { + public void setWarningDistance(int distance) { + this.handle.setWarningDistance(distance); + } ++ ++ // Paper start ++ @Override ++ public boolean isInBounds(Location location) { ++ return this.handle.isInBounds(new BlockPosition(location.getBlockX(), location.getBlockY(), location.getBlockZ())); ++ } ++ // Paper end + } +-- +2.11.0.windows.3 +