diff --git a/gradle.properties b/gradle.properties index 4539cc4..e9e8e58 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=me.totalfreedom.scissors version=1.19.1-R0.1-SNAPSHOT mcVersion=1.19.1 -paperRef=ceef4b9c0977f75b912a1fc993815e83786e47e1 +paperRef=7044a9c538edb16239a0579722968d395842cdbe org.gradle.caching=true org.gradle.parallel=true diff --git a/patches/server/0023-Validate-coordinates-before-attempting-to-get-block-.patch b/patches/server/0023-Validate-coordinates-before-attempting-to-get-block-.patch index b3c1cf3..cc12828 100644 --- a/patches/server/0023-Validate-coordinates-before-attempting-to-get-block-.patch +++ b/patches/server/0023-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 a68b737cdd1e9f1054e0fc3bfee92c20a062fab5..8e1a4302c62090b19e0ace2bb8fa1344afd0474e 100644 +index c39e6a96a120cd9c5f7734ead5dac2091fed7fc8..4e75fdc2da5b04749fef5fad6d3f36e02f60cf59 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1935,6 +1935,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @@ -28,7 +28,7 @@ index a68b737cdd1e9f1054e0fc3bfee92c20a062fab5..8e1a4302c62090b19e0ace2bb8fa1344 @Override public void handleUseItemOn(ServerboundUseItemOnPacket packet) { PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel()); -@@ -3428,17 +3440,24 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -3439,17 +3451,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/0033-Prevent-invalid-container-events.patch b/patches/server/0033-Prevent-invalid-container-events.patch index 39e78ca..3fa06ad 100644 --- a/patches/server/0033-Prevent-invalid-container-events.patch +++ b/patches/server/0033-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 814c0ea4b59dbb82e973810a36c81237c9e5f2d6..5a6bfc0cc430372f1fe1c0c4eba832675bd3940e 100644 +index 481359dc2dee9394d9390b24b4f51f3def6b5ccf..e2b7bc274325de3a30c50ba3ce7aee5f19ab177a 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 814c0ea4b59dbb82e973810a36c81237c9e5f2d6..5a6bfc0cc430372f1fe1c0c4eba83267 import net.minecraft.ChatFormatting; import net.minecraft.CrashReport; import net.minecraft.CrashReportCategory; -@@ -3075,6 +3077,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -3086,6 +3088,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 814c0ea4b59dbb82e973810a36c81237c9e5f2d6..5a6bfc0cc430372f1fe1c0c4eba83267 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 -@@ -3096,6 +3099,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -3107,6 +3110,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic return; }