diff --git a/gradle.properties b/gradle.properties index f2d5e07..b6fc725 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=44dc5a4c2669f3888bd50a7cb693e43fc1f09280 +paperRef=7b52db5f612ff0aca575760e79fd24be96b10fdd 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 95e0f3b..692ad29 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,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 0c2255b6e2fb7752f85b0f83d4f84732758bd14d..ff72911cca59528f7090533e52450a59ea50a92a 100644 +index 08cb3db28f13c352a162009deeb28ee637e98d2a..da47e84dffd3518b84eeeb80ab4f17073fed9a9c 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -1926,6 +1926,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -1922,6 +1922,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic } // Spigot end @@ -28,7 +28,7 @@ index 0c2255b6e2fb7752f85b0f83d4f84732758bd14d..ff72911cca59528f7090533e52450a59 @Override public void handleUseItemOn(ServerboundUseItemOnPacket packet) { PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel()); -@@ -3310,17 +3322,24 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -3306,17 +3318,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/0031-Add-spectator-teleport-event.patch b/patches/server/0031-Add-spectator-teleport-event.patch index 3ed2335..3a3f653 100644 --- a/patches/server/0031-Add-spectator-teleport-event.patch +++ b/patches/server/0031-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 ff72911cca59528f7090533e52450a59ea50a92a..8d626169874c4188e2a9bc214b1c0af9689b11b3 100644 +index da47e84dffd3518b84eeeb80ab4f17073fed9a9c..028d41c22ec5d67434dc42926cd875fe576768ea 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 ff72911cca59528f7090533e52450a59ea50a92a..8d626169874c4188e2a9bc214b1c0af9 import com.google.common.collect.Lists; import com.google.common.primitives.Floats; import com.mojang.brigadier.ParseResults; -@@ -2072,6 +2073,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2068,6 +2069,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic Entity entity = packet.getEntity(worldserver); if (entity != null) { diff --git a/patches/server/0032-Prevent-invalid-container-events.patch b/patches/server/0032-Prevent-invalid-container-events.patch index 8928c91..e7ab6a8 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 8d626169874c4188e2a9bc214b1c0af9689b11b3..53a71e699e885aa36fcc07f04fb5f15e4661b7f2 100644 +index 028d41c22ec5d67434dc42926cd875fe576768ea..5086fc9f81e9ae894b6fa64819e77267812cae17 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 8d626169874c4188e2a9bc214b1c0af9689b11b3..53a71e699e885aa36fcc07f04fb5f15e import net.minecraft.ChatFormatting; import net.minecraft.CrashReport; import net.minecraft.CrashReportCategory; -@@ -2952,6 +2954,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2948,6 +2950,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 8d626169874c4188e2a9bc214b1c0af9689b11b3..53a71e699e885aa36fcc07f04fb5f15e 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 -@@ -2973,6 +2976,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2969,6 +2972,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic return; } diff --git a/patches/server/0036-Validate-block-entity-tag-query-positions.patch b/patches/server/0036-Validate-block-entity-tag-query-positions.patch index 4aca131..0cef858 100644 --- a/patches/server/0036-Validate-block-entity-tag-query-positions.patch +++ b/patches/server/0036-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 53a71e699e885aa36fcc07f04fb5f15e4661b7f2..f54a8732d30590225ac986f05a08f4a40b2ae18c 100644 +index 5086fc9f81e9ae894b6fa64819e77267812cae17..ca2b1affa23faf7153fad9e97afbb3b55f1e85d4 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -1364,7 +1364,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -1360,7 +1360,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @Override public void handleBlockEntityTagQuery(ServerboundBlockEntityTagQuery packet) { PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());