From af86fbc4654092ef3af9829db53b013454682fa9 Mon Sep 17 00:00:00 2001 From: Telesphoreo Date: Fri, 28 Apr 2023 21:43:33 -0500 Subject: [PATCH] Update Paper --- build.gradle.kts | 4 ++-- gradle.properties | 2 +- patches/server/0029-Block-server-side-chunkbans.patch | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index a0125f8..db662da 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,8 +1,8 @@ plugins { java `maven-publish` - id("com.github.johnrengelman.shadow") version "8.1.0" apply false - id("io.papermc.paperweight.patcher") version "1.5.4" + id("com.github.johnrengelman.shadow") version "8.1.1" apply false + id("io.papermc.paperweight.patcher") version "1.5.5" } val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/" diff --git a/gradle.properties b/gradle.properties index 735457e..a386016 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=me.totalfreedom.scissors version=1.19.4-R0.1-SNAPSHOT mcVersion=1.19.4 -paperRef=936205beae24652acf56c6e765072bc6a0156ed3 +paperRef=bcec5b11e6728f3eb3078aa4fcc8e87f3d545ec2 org.gradle.caching=true org.gradle.parallel=true diff --git a/patches/server/0029-Block-server-side-chunkbans.patch b/patches/server/0029-Block-server-side-chunkbans.patch index d999a45..a2fb0d1 100644 --- a/patches/server/0029-Block-server-side-chunkbans.patch +++ b/patches/server/0029-Block-server-side-chunkbans.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Block server side chunkbans diff --git a/src/main/java/net/minecraft/network/PacketEncoder.java b/src/main/java/net/minecraft/network/PacketEncoder.java -index ebee957fb048da6ffcd2a5ba2ed989ed1a6634e9..889342fac2903f16846e9303631a64df6fcfc589 100644 +index fbfadeb83719b81f42724e79c59e92ed88fdece7..d9ed02aa0dcec82bdf9d42c224694773b9307cfe 100644 --- a/src/main/java/net/minecraft/network/PacketEncoder.java +++ b/src/main/java/net/minecraft/network/PacketEncoder.java @@ -6,9 +6,26 @@ import io.netty.channel.ChannelHandlerContext; @@ -48,7 +48,7 @@ index ebee957fb048da6ffcd2a5ba2ed989ed1a6634e9..889342fac2903f16846e9303631a64df + packet.write(friendlyByteBuf); + int k = friendlyByteBuf.writerIndex() - j; + int packetLength = friendlyByteBuf.readableBytes(); -+ if (k > 8388608 || packetLength > MAX_PACKET_SIZE) { ++ if (k > 8388608 || packetLength > MAX_PACKET_SIZE) { + throw new SkipPacketException(new IllegalArgumentException("Packet too big (is " + k + "): " + packet)); + } + @@ -72,7 +72,7 @@ index ebee957fb048da6ffcd2a5ba2ed989ed1a6634e9..889342fac2903f16846e9303631a64df - int j = friendlyByteBuf.writerIndex(); - packet.write(friendlyByteBuf); - int k = friendlyByteBuf.writerIndex() - j; -- if (k > 8388608) { +- if (false && k > 8388608) { // Paper - disable - throw new IllegalArgumentException("Packet too big (is " + k + ", should be less than 8388608): " + packet); - } else { - int l = channelHandlerContext.channel().attr(Connection.ATTRIBUTE_PROTOCOL).get().getId(); @@ -168,7 +168,7 @@ index ebee957fb048da6ffcd2a5ba2ed989ed1a6634e9..889342fac2903f16846e9303631a64df + // Scissors end + // Paper start - private static int MAX_PACKET_SIZE = 2097152; + private static int MAX_PACKET_SIZE = 8388608; diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundBlockEntityDataPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundBlockEntityDataPacket.java index 3944852921335c78a04a9dc301882ab5b152b1ed..96ee53c7cc862e059328c5cdf5e07f309df6a79e 100644