diff options
| author | Jake Potrebic <[email protected]> | 2021-06-07 21:39:24 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-06-08 06:39:24 +0200 |
| commit | 81de619d3c512dfb24da19164660a9d0957681be (patch) | |
| tree | d2568727b39491ab4c16083a59c68baedec4f5cd | |
| parent | 5e3604f1b41886a8c190a4069aec0ec1cc6023b4 (diff) | |
| download | Paper-81de619d3c512dfb24da19164660a9d0957681be.tar.gz Paper-81de619d3c512dfb24da19164660a9d0957681be.zip | |
Updated Upstream (CraftBukkit) (#5786)
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
CraftBukkit Changes:
fae895ac Fix inconsistent commands
| -rw-r--r-- | Spigot-Server-Patches/0009-Timings-v2.patch | 13 | ||||
| m--------- | work/CraftBukkit | 0 |
2 files changed, 0 insertions, 13 deletions
diff --git a/Spigot-Server-Patches/0009-Timings-v2.patch b/Spigot-Server-Patches/0009-Timings-v2.patch index 51416f69af..6113ef6b52 100644 --- a/Spigot-Server-Patches/0009-Timings-v2.patch +++ b/Spigot-Server-Patches/0009-Timings-v2.patch @@ -774,19 +774,6 @@ index 989683265a99fc51607aa130733e00033b444a6a..e47da20ab8ce4da34755e105bf55d854 } else { PlayerConnectionUtils.LOGGER.debug("Ignoring packet due to disconnection: " + packet); } -diff --git a/src/main/java/net/minecraft/network/protocol/game/PacketPlayInChat.java b/src/main/java/net/minecraft/network/protocol/game/PacketPlayInChat.java -index a76dd78cf01a76f3083966c88e6ddf2ec778bec2..7263d467be59cec5faa651b1c705b26c9763384b 100644 ---- a/src/main/java/net/minecraft/network/protocol/game/PacketPlayInChat.java -+++ b/src/main/java/net/minecraft/network/protocol/game/PacketPlayInChat.java -@@ -21,7 +21,7 @@ public class PacketPlayInChat implements Packet<PacketListenerPlayIn> { - - @Override - public void a(PacketDataSerializer packetdataserializer) throws IOException { -- this.a = packetdataserializer.e(256); -+ this.a = org.apache.commons.lang3.StringUtils.normalizeSpace(packetdataserializer.e(256)); - } - - @Override diff --git a/src/main/java/net/minecraft/server/CustomFunctionData.java b/src/main/java/net/minecraft/server/CustomFunctionData.java index 21f5474a1cd60168ca059da542a432d40d88b514..07ca1234ad6ffa797003f7317fb88abf732bc159 100644 --- a/src/main/java/net/minecraft/server/CustomFunctionData.java diff --git a/work/CraftBukkit b/work/CraftBukkit -Subproject 3797d93e369645c9b2d9ab0188aa893a1128062 +Subproject fae895ac110a830e4bbd5cc9eadbf70104ce215 |