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/0106-Add-setting-for-proxy-online-mode-status.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/0106-Add-setting-for-proxy-online-mode-status.patch')
| -rw-r--r-- | patches/server/0106-Add-setting-for-proxy-online-mode-status.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/server/0106-Add-setting-for-proxy-online-mode-status.patch b/patches/server/0106-Add-setting-for-proxy-online-mode-status.patch index 3e700955a0..1a974e7c8e 100644 --- a/patches/server/0106-Add-setting-for-proxy-online-mode-status.patch +++ b/patches/server/0106-Add-setting-for-proxy-online-mode-status.patch @@ -43,10 +43,10 @@ index 0214830d9bc98b8d435ff11f40df65596980cf77..5db27d7bcaaa2eeaeeb08401513d8d23 } else { String[] astring1 = astring; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 0476ae7a485c2ac74b39965f0727fbfd372c3be2..649f9a5604da73f332ad6c9725bddab5e85f1ae7 100644 +index 69934e156db7fdec00b6b77b20835894a1e3dcb3..085c11983884911a61bc96a6df07ad8a96657e6c 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1727,7 +1727,7 @@ public final class CraftServer implements Server { +@@ -1726,7 +1726,7 @@ public final class CraftServer implements Server { // Spigot Start GameProfile profile = null; // Only fetch an online UUID in online mode |