core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Expose WorldBorder@isInBounds(Location) check

This commit is contained in:
Zach Brown 2017-01-21 17:06:28 -06:00
parent 10b1631d59
commit 3f88bc1ec7
No known key found for this signature in database
GPG Key ID: CC9DA35FC5450B76
2 changed files with 60 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Spigot-API-Patches/0050-Expose-WorldBorder-isInBounds-Location-check.patch Normal file
View File

@ -0,0 +1,28 @@
From 2929553345386ced98bef0739339bed732757880 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
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

32
Spigot-Server-Patches/0208-Expose-WorldBorder-isInBounds-Location-method.patch Normal file
View File

@ -0,0 +1,32 @@
From c6e95d2264c36e04739c97f4e9eb9663e661cbdf Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
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