mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-06 11:58:10 +02:00
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Please note that this build includes changes to meet upstreams requirements for nullability annotations. While we aim for a level of accuracy, these might not be 100% correct, if there are any issues, please speak to us on discord, or open an issue on the tracker to discuss. Bukkit Changes: 9a6a1de3 Remove nullability annotations from enum constructors 3f0591ea SPIGOT-2540: Add nullability annotations to entire Bukkit API CraftBukkit Changes:8d8475fc
SPIGOT-4666: Force parameter in HumanEntity#sleep8b1588e2
Fix ExplosionPrimeEvent#setFire not working with EnderCrystals39a287b7
Don't ignore newlines in PlayerListHeader/Footer Spigot Changes: cf694d87 Add nullability annotations
33 lines
1.1 KiB
Diff
33 lines
1.1 KiB
Diff
From 4e9c8caa8395d98ee682ff83f656c5128a5801d0 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 7e8f5649..afb7b136 100644
|
|
--- a/src/main/java/org/bukkit/WorldBorder.java
|
|
+++ b/src/main/java/org/bukkit/WorldBorder.java
|
|
@@ -117,4 +117,18 @@ public interface WorldBorder {
|
|
* @return if this location is inside the border or not
|
|
*/
|
|
public boolean isInside(@NotNull Location location);
|
|
+
|
|
+ // 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.
|
|
+ * @deprecated use {@link #isInside(Location)} for an upstream compatible replacement
|
|
+ */
|
|
+ @Deprecated
|
|
+ public default boolean isInBounds(@NotNull Location location) {
|
|
+ return this.isInside(location);
|
|
+ }
|
|
+ // Paper end
|
|
}
|
|
--
|
|
2.21.0
|
|
|