From 8ee33f4a4d9cde367142aa3f5c57c1304ddacb4f Mon Sep 17 00:00:00 2001 From: Telesphoreo Date: Fri, 9 Jun 2023 01:24:06 -0500 Subject: [PATCH] Fix latest Paper revision --- gradle.properties | 2 +- patches/server/0030-Block-server-side-chunkbans.patch | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index 2c0a27c..cadd083 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=me.totalfreedom.scissors version=1.20-R0.1-SNAPSHOT mcVersion=1.20 -paperRef=e829a9d8f3a52a4803eaaa96a046c4a4876a262a +paperRef=f9fc44ff9fdf583beaad413e1f6b21116de83f06 org.gradle.caching=true org.gradle.parallel=true diff --git a/patches/server/0030-Block-server-side-chunkbans.patch b/patches/server/0030-Block-server-side-chunkbans.patch index 0bb04b3..3f29dbb 100644 --- a/patches/server/0030-Block-server-side-chunkbans.patch +++ b/patches/server/0030-Block-server-side-chunkbans.patch @@ -154,7 +154,7 @@ index 3944852921335c78a04a9dc301882ab5b152b1ed..96ee53c7cc862e059328c5cdf5e07f30 this.type = blockEntityType; this.tag = nbt.isEmpty() ? null : nbt; diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java -index bd439aef96aeecb9c72b5f50d748d231cccbc970..fda495bfefac4c3b147f5f6b6eb18ad5d103fef2 100644 +index 39b879f21f958dbd91ab0f74e5d4f3c74928fc33..c5d568ce15879be812207f4cd7819f2f6e7d0f7e 100644 --- a/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java +++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java @@ -33,6 +33,13 @@ public class ClientboundLevelChunkPacketData { @@ -168,6 +168,6 @@ index bd439aef96aeecb9c72b5f50d748d231cccbc970..fda495bfefac4c3b147f5f6b6eb18ad5 + } + // Scissors end + - public ClientboundLevelChunkPacketData(LevelChunk chunk) { - this.heightmaps = new CompoundTag(); - + // Paper start - Anti-Xray - Add chunk packet info + @Deprecated @io.papermc.paper.annotation.DoNotUse public ClientboundLevelChunkPacketData(LevelChunk chunk) { this(chunk, null); } + public ClientboundLevelChunkPacketData(LevelChunk chunk, com.destroystokyo.paper.antixray.ChunkPacketInfo chunkPacketInfo) {