Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
464394434 fix book page limit length (#4932)
This commit is contained in:
BillyGalbreath
2020-12-23 19:22:17 -06:00
parent f3dccd186a
commit fe73b19d84
11 changed files with 13 additions and 16 deletions

View File

@@ -5,15 +5,12 @@ Subject: [PATCH] PlayerBookTooLargeEvent
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index f16109a08804e0942f2f41d9637bd9b88c1c8893..33327da588fec7c7458081d62ec6680d178c7dec 100644
index 3b32303b9e8c9c96938758c02ed72e3fea73a638..d413f3f15de603a9755e5ed9b949edec09b7006d 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -928,8 +928,9 @@ public class PlayerConnection implements PacketListenerPlayIn {
ItemStack testStack = packetplayinbedit.getBook();
if (!server.isPrimaryThread() && !testStack.isEmpty() && testStack.getTag() != null) {
@@ -930,6 +930,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
NBTTagList pageList = testStack.getTag().getList("pages", 8);
- if (pageList.size() > 50) {
+ if (pageList.size() > 100) { // Purpur - java edition has 100 pages
if (pageList.size() > 100) {
PlayerConnection.LOGGER.warn(this.player.getName() + " tried to send a book with too many pages");
+ net.pl3x.purpur.event.player.PlayerBookTooLargeEvent event = new net.pl3x.purpur.event.player.PlayerBookTooLargeEvent(player.getBukkitEntity(), testStack.asBukkitCopy()); if (event.shouldKickPlayer()) // Purpur
minecraftServer.scheduleOnMain(() -> this.disconnect("Book too large!"));