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/server/0596-Add-basic-Datapack-API.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/server/0596-Add-basic-Datapack-API.patch')
| -rw-r--r-- | patches/server/0596-Add-basic-Datapack-API.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/patches/server/0596-Add-basic-Datapack-API.patch b/patches/server/0596-Add-basic-Datapack-API.patch index e42c671b7b..f4b6915d39 100644 --- a/patches/server/0596-Add-basic-Datapack-API.patch +++ b/patches/server/0596-Add-basic-Datapack-API.patch @@ -92,10 +92,10 @@ index 0000000000000000000000000000000000000000..cf4374493c11057451a62a655514415c + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index cca320f018e0a59c55af09f7707f9121ad99a0ac..d345a6a9ed7f97e3abcd38633617a2c4ee0a3563 100644 +index ca03eb363438d97de71b1fe4b07304e4f8d3f422..3e505c1b680e1f384c5148ba309b6cf6b3da1e45 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -304,6 +304,7 @@ public final class CraftServer implements Server { +@@ -303,6 +303,7 @@ public final class CraftServer implements Server { public boolean ignoreVanillaPermissions = false; private final List<CraftPlayer> playerView; public int reloadCount; @@ -103,7 +103,7 @@ index cca320f018e0a59c55af09f7707f9121ad99a0ac..d345a6a9ed7f97e3abcd38633617a2c4 public static Exception excessiveVelEx; // Paper - Velocity warnings static { -@@ -393,6 +394,7 @@ public final class CraftServer implements Server { +@@ -392,6 +393,7 @@ public final class CraftServer implements Server { if (this.configuration.getBoolean("settings.use-map-color-cache")) { MapPalette.setMapColorCache(new CraftMapColorCache(this.logger)); } @@ -111,7 +111,7 @@ index cca320f018e0a59c55af09f7707f9121ad99a0ac..d345a6a9ed7f97e3abcd38633617a2c4 } public boolean getCommandBlockOverride(String command) { -@@ -2845,5 +2847,11 @@ public final class CraftServer implements Server { +@@ -2844,5 +2846,11 @@ public final class CraftServer implements Server { public com.destroystokyo.paper.entity.ai.MobGoals getMobGoals() { return mobGoals; } |