From 7d9d2d1b1989f5b8e0c10f3a36d5bc992b9bb814 Mon Sep 17 00:00:00 2001 From: Telesphoreo Date: Tue, 30 Aug 2022 21:31:34 -0500 Subject: [PATCH] Update Paper --- gradle.properties | 2 +- ...lidate-coordinates-before-attempting-to-get-block-.patch | 6 +++--- patches/server/0032-Add-spectator-teleport-event.patch | 4 ++-- patches/server/0033-Prevent-invalid-container-events.patch | 6 +++--- .../0037-Validate-block-entity-tag-query-positions.patch | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/gradle.properties b/gradle.properties index 5785c78..5637274 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=me.totalfreedom.scissors version=1.19.2-R0.1-SNAPSHOT mcVersion=1.19.2 -paperRef=aabf67672174c4b3bf5a7de65fdeb5315ade37dc +paperRef=eff22eb0541559f05cf9a8c370d70c3b346f80f6 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 3e6f088..c330467 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 c3a5aa2cbfeef1d2841ef85d135a2f6e0a7a2f61..43174f72360e35e1b5112b0f2ecd7881c673c07c 100644 +index 325def3149693f64b2b21e0e655b5b3e888fd9a0..4fc877f19e6b127914269a7073fa2725b9f322fe 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -1939,6 +1939,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -1933,6 +1933,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic } // Spigot end @@ -28,7 +28,7 @@ index c3a5aa2cbfeef1d2841ef85d135a2f6e0a7a2f61..43174f72360e35e1b5112b0f2ecd7881 @Override public void handleUseItemOn(ServerboundUseItemOnPacket packet) { PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel()); -@@ -3456,17 +3468,24 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -3450,17 +3462,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 9a2c33d..39384b5 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 43174f72360e35e1b5112b0f2ecd7881c673c07c..728ded5c2aff87a4087ef99515a5787500b97fef 100644 +index 4fc877f19e6b127914269a7073fa2725b9f322fe..ca36e4f3cdb257a7e8de93d8c2b82140eaaad56e 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 43174f72360e35e1b5112b0f2ecd7881c673c07c..728ded5c2aff87a4087ef99515a57875 import com.google.common.collect.Lists; import com.google.common.primitives.Floats; import com.mojang.brigadier.ParseResults; -@@ -2081,6 +2082,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2075,6 +2076,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 9c89a67..3706146 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 728ded5c2aff87a4087ef99515a5787500b97fef..5dfd4ed57a92632a19a7109d6ac0b093f8e20aa3 100644 +index ca36e4f3cdb257a7e8de93d8c2b82140eaaad56e..2fdaa6ff9782684b8840d7f76fe08680e53de635 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 728ded5c2aff87a4087ef99515a5787500b97fef..5dfd4ed57a92632a19a7109d6ac0b093 import net.minecraft.ChatFormatting; import net.minecraft.CrashReport; import net.minecraft.CrashReportCategory; -@@ -3103,6 +3105,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -3097,6 +3099,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 728ded5c2aff87a4087ef99515a5787500b97fef..5dfd4ed57a92632a19a7109d6ac0b093 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 -@@ -3124,6 +3127,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -3118,6 +3121,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 2e4b66b..9a4fcf7 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 5dfd4ed57a92632a19a7109d6ac0b093f8e20aa3..eee232d38f9bd305939660531e4e19a4b4bd7339 100644 +index 2fdaa6ff9782684b8840d7f76fe08680e53de635..03776df3303e74fa9bf88453180b43a8e30efa54 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -1378,7 +1378,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -1372,7 +1372,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @Override public void handleBlockEntityTagQuery(ServerboundBlockEntityTagQuery packet) { PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());