core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Jake Potrebic 2021-06-07 21:39:24 -07:00 committed by GitHub
parent 5e3604f1b4
commit 81de619d3c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Spigot-Server-Patches/0009-Timings-v2.patch
View File

@ -774,19 +774,6 @@ index 989683265a99fc51607aa130733e00033b444a6a..e47da20ab8ce4da34755e105bf55d854
} else { } else {
PlayerConnectionUtils.LOGGER.debug("Ignoring packet due to disconnection: " + packet); 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 diff --git a/src/main/java/net/minecraft/server/CustomFunctionData.java b/src/main/java/net/minecraft/server/CustomFunctionData.java
index 21f5474a1cd60168ca059da542a432d40d88b514..07ca1234ad6ffa797003f7317fb88abf732bc159 100644 index 21f5474a1cd60168ca059da542a432d40d88b514..07ca1234ad6ffa797003f7317fb88abf732bc159 100644
--- a/src/main/java/net/minecraft/server/CustomFunctionData.java --- a/src/main/java/net/minecraft/server/CustomFunctionData.java

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit 3797d93e369645c9b2d9ab0188aa893a11280628 Subproject commit fae895ac110a830e4bbd5cc9eadbf70104ce215e