From d61ec8e0058cabdf5d2cd4fec84885fcd3b70ed8 Mon Sep 17 00:00:00 2001 From: Telesphoreo Date: Mon, 26 Dec 2022 19:58:16 -0600 Subject: [PATCH] Update Paper --- gradle.properties | 2 +- .../0005-Fixes-the-Blank-SkullOwner-exploit.patch | 12 ++++++------ ...coordinates-before-attempting-to-get-block-.patch | 4 ++-- .../0032-Prevent-invalid-container-events.patch | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/gradle.properties b/gradle.properties index ea3c7df..d863fd3 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=f26e9ccdd0d08d765f96a32d1d124f0f6b9bb3a2 +paperRef=52718dba10c028a57a7a00993ed490a503ca9ecd org.gradle.caching=true org.gradle.parallel=true diff --git a/patches/server/0005-Fixes-the-Blank-SkullOwner-exploit.patch b/patches/server/0005-Fixes-the-Blank-SkullOwner-exploit.patch index d6fe747..f62c516 100644 --- a/patches/server/0005-Fixes-the-Blank-SkullOwner-exploit.patch +++ b/patches/server/0005-Fixes-the-Blank-SkullOwner-exploit.patch @@ -5,20 +5,20 @@ Subject: [PATCH] Fixes the Blank SkullOwner exploit diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java -index 2771dd62c04c8da890724fe03f836fdeba440c55..023916ec8dc85b30e521874bcc2104e89832282a 100644 +index deed77a3d44bc55681483d7f47f148b5220135f2..053cb78362006a94ee0d82b9b1f665c5f86a4458 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java -@@ -9,6 +9,9 @@ import java.util.UUID; - import net.minecraft.nbt.CompoundTag; +@@ -11,6 +11,9 @@ import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.NbtUtils; + import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.block.entity.SkullBlockEntity; +// Scissors start +import org.apache.commons.lang3.StringUtils; +// Scissors end import org.bukkit.Bukkit; import org.bukkit.Material; - import org.bukkit.OfflinePlayer; -@@ -63,7 +66,9 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta { + import org.bukkit.NamespacedKey; +@@ -73,7 +76,9 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta { if (tag.contains(SKULL_OWNER.NBT, CraftMagicNumbers.NBT.TAG_COMPOUND)) { this.setProfile(NbtUtils.readGameProfile(tag.getCompound(SKULL_OWNER.NBT))); @@ -28,4 +28,4 @@ index 2771dd62c04c8da890724fe03f836fdeba440c55..023916ec8dc85b30e521874bcc2104e8 + // Scissors end this.setProfile(new GameProfile(null, tag.getString(SKULL_OWNER.NBT))); } - } + 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 692ad29..54e88fc 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 08cb3db28f13c352a162009deeb28ee637e98d2a..da47e84dffd3518b84eeeb80ab4f17073fed9a9c 100644 +index 50d8d16b1856c0c875ccabbcfc240379a7669559..ad014bcb602ae041494948cfef939128bd86419b 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 08cb3db28f13c352a162009deeb28ee637e98d2a..da47e84dffd3518b84eeeb80ab4f1707 @Override public void handleUseItemOn(ServerboundUseItemOnPacket packet) { PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel()); -@@ -3306,17 +3318,24 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -3308,17 +3320,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 e7ab6a8..eb60154 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 028d41c22ec5d67434dc42926cd875fe576768ea..5086fc9f81e9ae894b6fa64819e77267812cae17 100644 +index a29a44d5ae3b6a0cd6fc012c931271502f9c55c4..15b68a89f928d661b215a4463689540abf150316 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 028d41c22ec5d67434dc42926cd875fe576768ea..5086fc9f81e9ae894b6fa64819e77267 import net.minecraft.ChatFormatting; import net.minecraft.CrashReport; import net.minecraft.CrashReportCategory; -@@ -2948,6 +2950,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2950,6 +2952,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 028d41c22ec5d67434dc42926cd875fe576768ea..5086fc9f81e9ae894b6fa64819e77267 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 -@@ -2969,6 +2972,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2971,6 +2974,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic return; }