From 522db24de098972c0dda868ef2d71b2727a755ee Mon Sep 17 00:00:00 2001 From: Jake Potrebic Date: Fri, 5 Aug 2022 07:10:44 -0700 Subject: [PATCH] Updated Upstream (Bukkit/CraftBukkit) (#8240) Upstream has released updates that appear 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: caa7c486 SPIGOT-7109: Add WorldBorder#setSize using TimeUnit CraftBukkit Changes: 1e3bf58cd SPIGOT-7109: Add WorldBorder#setSize using TimeUnit --- .../api/Expose-WorldBorder-isInBounds-Location-check.patch | 4 ++-- work/Bukkit | 2 +- work/CraftBukkit | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/patches/api/Expose-WorldBorder-isInBounds-Location-check.patch b/patches/api/Expose-WorldBorder-isInBounds-Location-check.patch index 5540e4c763..b804cea0b9 100644 --- a/patches/api/Expose-WorldBorder-isInBounds-Location-check.patch +++ b/patches/api/Expose-WorldBorder-isInBounds-Location-check.patch @@ -9,9 +9,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- a/src/main/java/org/bukkit/WorldBorder.java +++ b/src/main/java/org/bukkit/WorldBorder.java @@ -0,0 +0,0 @@ public interface WorldBorder { - * @return if this location is inside the border or not + * @return The absolute maximum center coordinate of the WorldBorder */ - public boolean isInside(@NotNull Location location); + public double getMaxCenterCoordinate(); + + // Paper start + /** diff --git a/work/Bukkit b/work/Bukkit index 0260da7a4a..caa7c4866a 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit 0260da7a4a687f86db2b69068f9b447cdfa28263 +Subproject commit caa7c4866ac49b04808b75284715543f221649a5 diff --git a/work/CraftBukkit b/work/CraftBukkit index 8f3647242a..1e3bf58cdb 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 8f3647242a7eadf8e2a7faf623089767c0466b52 +Subproject commit 1e3bf58cdb2b099308d94dbc34d950155ee83ac3