diff options
| author | Jake Potrebic <[email protected]> | 2022-08-05 07:10:44 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-08-05 16:10:44 +0200 |
| commit | 02831e3369cc9ad76a3add2e4140eb1e6d67cd4f (patch) | |
| tree | 652209634227acd5ea3ac1be21f957f6adc3dffa | |
| parent | a311dcecb3a7066a56175834a7aac2a2ba65f8bb (diff) | |
| download | Paper-02831e3369cc9ad76a3add2e4140eb1e6d67cd4f.tar.gz Paper-02831e3369cc9ad76a3add2e4140eb1e6d67cd4f.zip | |
Updated Upstream (Bukkit/CraftBukkit) (#8240)1.19.1
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
| -rw-r--r-- | patches/api/0052-Expose-WorldBorder-isInBounds-Location-check.patch | 8 | ||||
| m--------- | work/Bukkit | 0 | ||||
| m--------- | work/CraftBukkit | 0 |
3 files changed, 4 insertions, 4 deletions
diff --git a/patches/api/0052-Expose-WorldBorder-isInBounds-Location-check.patch b/patches/api/0052-Expose-WorldBorder-isInBounds-Location-check.patch index 16c0232c1b..1af9128e4d 100644 --- a/patches/api/0052-Expose-WorldBorder-isInBounds-Location-check.patch +++ b/patches/api/0052-Expose-WorldBorder-isInBounds-Location-check.patch @@ -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 95bb16185514e0b894f407028997ce7d4504f8fb..238b9e2309d633623d35a1dbded6edadf20831f3 100644 +index b1c08a7fc5856bcc29ee64d0a87b95a8ac940ddc..0f2f17f0a443ec5087b3373293b23f663be9dbe1 100644 --- a/src/main/java/org/bukkit/WorldBorder.java +++ b/src/main/java/org/bukkit/WorldBorder.java -@@ -127,4 +127,18 @@ public interface WorldBorder { - * @return if this location is inside the border or not +@@ -162,4 +162,18 @@ public interface WorldBorder { + * @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 -Subproject 0260da7a4a687f86db2b69068f9b447cdfa2826 +Subproject caa7c4866ac49b04808b75284715543f221649a diff --git a/work/CraftBukkit b/work/CraftBukkit -Subproject 8f3647242a7eadf8e2a7faf623089767c0466b5 +Subproject 1e3bf58cdb2b099308d94dbc34d950155ee83ac |