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
parent 513393d4cf
commit 8ad27b61bc
2 changed files with 1 additions and 14 deletions

View file

@ -774,19 +774,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
} 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/network/protocol/game/PacketPlayInChat.java
+++ b/src/main/java/net/minecraft/network/protocol/game/PacketPlayInChat.java
@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/CustomFunctionData.java

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