mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-04 18:01:17 +01:00
5c7081fecc
* Updated Upstream (Bukkit/CraftBukkit) 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 Bukkit Changes: 45690fe9 SPIGOT-5047: Correct slot types for 1.14 inventories CraftBukkit Changes:4090d01fSPIGOT-5047: Correct slot types for 1.14 inventoriese8c08362SPIGOT-5046: World#getLoadedChunks returning inaccessible cached chunks.d445af3bSPIGOT-5067: Add item meta for 1.14 spawn eggs * Bring Chunk load checks in-line with spigot As of the last upstream merge spigot now checks ticket level status when returning loaded chunks for a world from api. Now our checks will respect that decision. * Fix spawn ticket levels Vanilla would keep the inner chunks of spawn available for ticking, however my changes made all chunks non-ticking. Resolve by changing ticket levels for spawn chunks inside the border to respect this behavior. * Make World#getChunkIfLoadedImmediately return only entity ticking chunks Mojang appears to be using chunks with level > 33 (non-ticking chunks) as cached chunks and not actually loaded chunks. * Bring all loaded checks in line with spigot Loaded chunks must be at least border chunks, or level <= 33
33 lines
1.1 KiB
Diff
33 lines
1.1 KiB
Diff
From 60572f2bac5d9d2b536872d4a31b06b5e954115d 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 7e8f5649c..afb7b136b 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
|
|
|