Update upstream B/CB/S

This commit is contained in:
Zach Brown
2017-01-25 22:27:42 -06:00
parent 21a724147a
commit 65a99a06a8
7 changed files with 17 additions and 36 deletions

View File

@@ -5,13 +5,13 @@ 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
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/WorldBorder.java
+++ b/src/main/java/org/bukkit/WorldBorder.java
@@ -0,0 +0,0 @@ public interface WorldBorder {
* @param distance The distance in blocks. (The default is 5 blocks.)
* @return if this location is inside the border or not
*/
public void setWarningDistance(int distance);
public boolean isInside(Location location);
+
+ // Paper start
+ /**
@@ -19,8 +19,12 @@ index 55c8983b..1957507c 100644
+ *
+ * @param location specific location to check
+ * @return true if the location is within the bounds of this border, false otherwise.
+ * @deprecated use {@link #isInside(Location)} for an upstream compatible replacement
+ */
+ public boolean isInBounds(Location location);
+ @Deprecated
+ public default boolean isInBounds(Location location) {
+ return this.isInside(location);
+ }
+ // Paper end
}
--