From aceb6d07db83161794b404de823edc87cf267601 Mon Sep 17 00:00:00 2001 From: Telesphoreo Date: Sat, 11 Feb 2023 14:58:28 -0600 Subject: [PATCH] Update Paper --- gradle.properties | 2 +- ...lidate-coordinates-before-attempting-to-get-block-.patch | 4 ++-- patches/server/0032-Prevent-invalid-container-events.patch | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gradle.properties b/gradle.properties index 3c6c057..bee8f46 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=me.totalfreedom.scissors version=1.19.3-R0.1-SNAPSHOT mcVersion=1.19.3 -paperRef=57f11578714a6a52111130dbabb702b30cdc746f +paperRef=bd77b78e4f8b6fb040c5ba7efaaa826565f24b6e org.gradle.caching=true org.gradle.parallel=true diff --git a/patches/server/0022-Validate-coordinates-before-attempting-to-get-block-.patch b/patches/server/0022-Validate-coordinates-before-attempting-to-get-block-.patch index 54e88fc..b2c1223 100644 --- a/patches/server/0022-Validate-coordinates-before-attempting-to-get-block-.patch +++ b/patches/server/0022-Validate-coordinates-before-attempting-to-get-block-.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Validate coordinates before attempting to get block entities diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 50d8d16b1856c0c875ccabbcfc240379a7669559..ad014bcb602ae041494948cfef939128bd86419b 100644 +index 9b0b42add71172bd154226e51d62cebd8de3542e..9e093d3001a57b577a7c93d8b721235617656e15 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1922,6 +1922,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @@ -28,7 +28,7 @@ index 50d8d16b1856c0c875ccabbcfc240379a7669559..ad014bcb602ae041494948cfef939128 @Override public void handleUseItemOn(ServerboundUseItemOnPacket packet) { PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel()); -@@ -3308,17 +3320,24 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -3314,17 +3326,24 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic if (!itemstack.isEmpty() && nbttagcompound != null && nbttagcompound.contains("x") && nbttagcompound.contains("y") && nbttagcompound.contains("z") && this.player.getBukkitEntity().hasPermission("minecraft.nbt.copy")) { // Spigot BlockPos blockposition = BlockEntity.getPosFromTag(nbttagcompound); diff --git a/patches/server/0032-Prevent-invalid-container-events.patch b/patches/server/0032-Prevent-invalid-container-events.patch index eb60154..4a6c5d4 100644 --- a/patches/server/0032-Prevent-invalid-container-events.patch +++ b/patches/server/0032-Prevent-invalid-container-events.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent invalid container events diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index a29a44d5ae3b6a0cd6fc012c931271502f9c55c4..15b68a89f928d661b215a4463689540abf150316 100644 +index c8760e58589cd574e9debd29f7e728b482ec1daf..f780dc437741db42da07241c94f1458aa2654cb1 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -29,6 +29,8 @@ import java.util.function.UnaryOperator; @@ -17,7 +17,7 @@ index a29a44d5ae3b6a0cd6fc012c931271502f9c55c4..15b68a89f928d661b215a4463689540a import net.minecraft.ChatFormatting; import net.minecraft.CrashReport; import net.minecraft.CrashReportCategory; -@@ -2950,6 +2952,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2956,6 +2958,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic public void handleContainerClick(ServerboundContainerClickPacket packet) { PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel()); if (this.player.isImmobile()) return; // CraftBukkit @@ -25,7 +25,7 @@ index a29a44d5ae3b6a0cd6fc012c931271502f9c55c4..15b68a89f928d661b215a4463689540a this.player.resetLastActionTime(); if (this.player.containerMenu.containerId == packet.getContainerId() && this.player.containerMenu.stillValid(this.player)) { // CraftBukkit boolean cancelled = this.player.isSpectator(); // CraftBukkit - see below if -@@ -2971,6 +2974,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2977,6 +2980,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic return; }