diff options
| author | Aikar <[email protected]> | 2020-06-01 23:15:47 -0400 |
|---|---|---|
| committer | Aikar <[email protected]> | 2020-06-02 01:29:18 -0400 |
| commit | 70ad51a80c9ff18ee3cc27aa7c67d54b45944619 (patch) | |
| tree | 423db14f38d727e3104a570c18528f1689430706 /Spigot-Server-Patches/0004-MC-Utils.patch | |
| parent | d7cfa4fa5c428ce17c712771a632d555ec3c7b29 (diff) | |
| download | Paper-70ad51a80c9ff18ee3cc27aa7c67d54b45944619.tar.gz Paper-70ad51a80c9ff18ee3cc27aa7c67d54b45944619.zip | |
Updated Upstream (Bukkit/CraftBukkit)
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
My recent work on serialization is now in CraftBukkit so was able to drop the patch and Paper
is now consistent with upstream.
Bukkit Changes:
e2699636 Move API notes to more obvious location
CraftBukkit Changes:
1b2830a3 SPIGOT-4441: Fix serializing Components to and from Legacy
Diffstat (limited to 'Spigot-Server-Patches/0004-MC-Utils.patch')
| -rw-r--r-- | Spigot-Server-Patches/0004-MC-Utils.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Spigot-Server-Patches/0004-MC-Utils.patch b/Spigot-Server-Patches/0004-MC-Utils.patch index 64fe070438..d6470aa738 100644 --- a/Spigot-Server-Patches/0004-MC-Utils.patch +++ b/Spigot-Server-Patches/0004-MC-Utils.patch @@ -4237,7 +4237,7 @@ index 7ad30548e2ad221494d6870b0b3a08e1d2f3ed06..b505244516321292e56609eaa54693d8 @Override diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 0c496ee0a04da4f0523f6e629f26e99c490f171a..6a681d694e76fa6f38d00ee7bae67762f3e5c34f 100644 +index 8cc5f417fe2ad2370b52236e8f5497688553aeba..f40cb14d5301631161f1701043ee987359d9a8e9 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -67,9 +67,9 @@ public class PlayerConnection implements PacketListenerPlayIn { |