diff options
author | Nassim Jahnke <[email protected]> | 2023-09-23 12:06:03 +1000 |
---|---|---|
committer | Nassim Jahnke <[email protected]> | 2023-09-23 12:21:59 +1000 |
commit | 9df2066642d32a1f7a372ce528930d48f9fe51f7 (patch) | |
tree | 5d066b71460c58442b76b2176dab30516d1aca90 /patches/api/0135-Allow-Blocks-to-be-accessed-via-a-long-key.patch | |
parent | 4c17176c779c16901423886020094cbf89e34b51 (diff) | |
download | Paper-9df2066642d32a1f7a372ce528930d48f9fe51f7.tar.gz Paper-9df2066642d32a1f7a372ce528930d48f9fe51f7.zip |
Updated Upstream (Bukkit/CraftBukkit)
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:
dfe1fb48 PR-906: Add missing MinecraftExperimental annotation to Bundles
825ab30d PR-905: Add missing MapCursor.Type and update documentation
e03d10e6 PR-903: Make BARRIER Waterlogged
1961ead6 PR-898: Use Java Consumer instead of Bukkit Consumer
CraftBukkit Changes:
f71a799f0 Make BARRIER Waterlogged
172f76a45 Upgrade specialsource-maven-plugin
f0702775c SPIGOT-7486: Alternate approach to null profile names
069495671 SPIGOT-7485: Allow air entity items since required for Vanilla logic
5dfd33dc2 SPIGOT-7484: Cancelling PlayerEditBookEvent does not update client's book contents
02d490788 PR-1250: Standardize and centralize Bukkit / Minecraft registry conversion
9024a09b9 PR-1251: Use Java Consumer instead of Bukkit Consumer
6d4b25bf1 Increase diff stability
Diffstat (limited to 'patches/api/0135-Allow-Blocks-to-be-accessed-via-a-long-key.patch')
-rw-r--r-- | patches/api/0135-Allow-Blocks-to-be-accessed-via-a-long-key.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/patches/api/0135-Allow-Blocks-to-be-accessed-via-a-long-key.patch b/patches/api/0135-Allow-Blocks-to-be-accessed-via-a-long-key.patch index 404eb3b27c..69f2642e46 100644 --- a/patches/api/0135-Allow-Blocks-to-be-accessed-via-a-long-key.patch +++ b/patches/api/0135-Allow-Blocks-to-be-accessed-via-a-long-key.patch @@ -50,7 +50,7 @@ index aa6821aa33d3c579a139bd7c0378253c43b3754a..6e6e65c40813ccce618fa7a3df2c0030 * @return A new location where X/Y/Z are the center of the block */ diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 159307600747c49948c5242d6cf39eed08c902e7..e83de41cbaf0e5a68ce0d5ad2b5ec10877ec4055 100644 +index 7f104d2c94d1de3eb003e412c35b5324beeada33..762be36670b12286876917b9fbf64ca5bddf6c2e 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -96,6 +96,41 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient |