Update upstream B/CB/S

Spigot-API-Patches/0050-Expose-WorldBorder-isInBounds-Location-check.patch

@@ -1,17 +1,17 @@
-From 2929553345386ced98bef0739339bed732757880 Mon Sep 17 00:00:00 2001
+From 3f1104eade7370f1304f56444a1b5e0d694ada62 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
+index 4dc18ed..41b7fae 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.)
+@@ -114,4 +114,18 @@ public interface WorldBorder {
+      * @return if this location is inside the border or not
       */
-     public void setWarningDistance(int distance);
+     public boolean isInside(Location location);
 +
 +    // Paper start
 +    /**
@@ -19,10 +19,14 @@ 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
  }
 -- 
-2.11.0.windows.3
+2.9.3