diff --git a/gradle.properties b/gradle.properties index 93f8faa..4539cc4 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=dd3e4e7bd66c3e94fafd8cf1480d7087f023c89d +paperRef=ceef4b9c0977f75b912a1fc993815e83786e47e1 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 c549f9d..b3c1cf3 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,10 +6,10 @@ 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 5cf5dcf092eb89d7995389a24e7f356f23a727a1..d4132f9a85525dd0f9a6969afcba5c8fab2337d1 100644 +index a68b737cdd1e9f1054e0fc3bfee92c20a062fab5..8e1a4302c62090b19e0ace2bb8fa1344afd0474e 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -1931,6 +1931,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -1935,6 +1935,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic } // Spigot end @@ -28,7 +28,7 @@ index 5cf5dcf092eb89d7995389a24e7f356f23a727a1..d4132f9a85525dd0f9a6969afcba5c8f @Override public void handleUseItemOn(ServerboundUseItemOnPacket packet) { PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel()); -@@ -3424,17 +3436,24 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -3428,17 +3440,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-Add-spectator-teleport-event.patch b/patches/server/0032-Add-spectator-teleport-event.patch index c0877f3..00fba2a 100644 --- a/patches/server/0032-Add-spectator-teleport-event.patch +++ b/patches/server/0032-Add-spectator-teleport-event.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add spectator teleport event diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 5e105ed98ce3a1ec4b3acc98f57a526404fa1052..fc5f997f70ee35d666db6941c16e0b34726bb2b2 100644 +index 8e1a4302c62090b19e0ace2bb8fa1344afd0474e..814c0ea4b59dbb82e973810a36c81237c9e5f2d6 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1,5 +1,6 @@ @@ -15,7 +15,7 @@ index 5e105ed98ce3a1ec4b3acc98f57a526404fa1052..fc5f997f70ee35d666db6941c16e0b34 import com.google.common.collect.Lists; import com.google.common.primitives.Floats; import com.mojang.brigadier.ParseResults; -@@ -2073,6 +2074,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2077,6 +2078,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic Entity entity = packet.getEntity(worldserver); if (entity != null) { diff --git a/patches/server/0033-Prevent-invalid-container-events.patch b/patches/server/0033-Prevent-invalid-container-events.patch index 4315250..39e78ca 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 be5aca3aecc1d00f3c308fc7adfa11f09e7554ed..4a41d4778b96dc5c82fdedc9b77b67b155c84605 100644 +index 814c0ea4b59dbb82e973810a36c81237c9e5f2d6..5a6bfc0cc430372f1fe1c0c4eba832675bd3940e 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 be5aca3aecc1d00f3c308fc7adfa11f09e7554ed..4a41d4778b96dc5c82fdedc9b77b67b1 import net.minecraft.ChatFormatting; import net.minecraft.CrashReport; import net.minecraft.CrashReportCategory; -@@ -3071,6 +3073,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -3075,6 +3077,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 be5aca3aecc1d00f3c308fc7adfa11f09e7554ed..4a41d4778b96dc5c82fdedc9b77b67b1 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 -@@ -3092,6 +3095,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -3096,6 +3099,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic return; } diff --git a/patches/server/0037-Validate-block-entity-tag-query-positions.patch b/patches/server/0037-Validate-block-entity-tag-query-positions.patch index 2b624f2..bbaa929 100644 --- a/patches/server/0037-Validate-block-entity-tag-query-positions.patch +++ b/patches/server/0037-Validate-block-entity-tag-query-positions.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Validate block entity tag query positions diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 6928add0c56541addb6e1fbffaa8eeb683bd947e..1cc97e98f09db4e3ab8ceeaca4763d912a97dab6 100644 +index 5a6bfc0cc430372f1fe1c0c4eba832675bd3940e..ee45edfba138f077a73c6cc7dbc23da589330272 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -1371,7 +1371,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -1375,7 +1375,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @Override public void handleBlockEntityTagQuery(ServerboundBlockEntityTagQuery packet) { PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());