Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
d5cb9308f fix #5224
d23f8b62e fix? #5222
0f2575de2 fix? #5222
7c3499702 fix? #5218
c8eec830b fix #5217
a235c77ce Adventure 4.5.0
This commit is contained in:
jmp
2021-02-22 04:42:43 -08:00
parent 55af1079b5
commit 274c7b2ccc
15 changed files with 42 additions and 42 deletions

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] PlayerBookTooLargeEvent
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 050d6db2a6a0bd5922efd720f5a0cd99b3090144..f6b120e2dc7f925cb0af11e7599f16194f7ca6c6 100644
index c926b8b1f1233a3320c7f901162b2b4a098cff8c..8162a8e252f12af2d0ecd6c2febc31a5bd619606 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -966,6 +966,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -970,6 +970,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
NBTTagList pageList = testStack.getTag().getList("pages", 8);
if (pageList.size() > 100) {
PlayerConnection.LOGGER.warn(this.player.getName() + " tried to send a book with too many pages");
@@ -16,7 +16,7 @@ index 050d6db2a6a0bd5922efd720f5a0cd99b3090144..f6b120e2dc7f925cb0af11e7599f1619
minecraftServer.scheduleOnMain(() -> this.disconnect("Book too large!"));
return;
}
@@ -978,6 +979,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -982,6 +983,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
int byteLength = testString.getBytes(java.nio.charset.StandardCharsets.UTF_8).length;
if (byteLength > 256 * 4) {
PlayerConnection.LOGGER.warn(this.player.getName() + " tried to send a book with with a page too large!");
@@ -24,7 +24,7 @@ index 050d6db2a6a0bd5922efd720f5a0cd99b3090144..f6b120e2dc7f925cb0af11e7599f1619
minecraftServer.scheduleOnMain(() -> this.disconnect("Book too large!"));
return;
}
@@ -1001,6 +1003,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1005,6 +1007,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
if (byteTotal > byteAllowed) {
PlayerConnection.LOGGER.warn(this.player.getName() + " tried to send too large of a book. Book Size: " + byteTotal + " - Allowed: "+ byteAllowed + " - Pages: " + pageList.size());