diff options
| author | Josh Roy <[email protected]> | 2021-06-06 15:04:43 -0400 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-06-06 19:04:43 +0000 |
| commit | d20e5b1954adfb2da02e7e5389e63baf82c528f5 (patch) | |
| tree | 5f29aab2f86a4b23ab3f4d7fec4859948b70a1c0 | |
| parent | 0daded2f25184b45fcc0be6ea86b63492df96024 (diff) | |
| download | Paper-d20e5b1954adfb2da02e7e5389e63baf82c528f5.tar.gz Paper-d20e5b1954adfb2da02e7e5389e63baf82c528f5.zip | |
Fix timings sometimes incorrectly marking commands (#5783)
| -rw-r--r-- | Spigot-Server-Patches/0009-Timings-v2.patch | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/Spigot-Server-Patches/0009-Timings-v2.patch b/Spigot-Server-Patches/0009-Timings-v2.patch index 6113ef6b52..51416f69af 100644 --- a/Spigot-Server-Patches/0009-Timings-v2.patch +++ b/Spigot-Server-Patches/0009-Timings-v2.patch @@ -774,6 +774,19 @@ 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 |