From 6015aa70b71f7cbfb10482f306526f2f49e611a5 Mon Sep 17 00:00:00 2001 From: Telesphoreo Date: Fri, 14 Jul 2023 16:11:25 -0500 Subject: [PATCH] Update Paper --- gradle.properties | 2 +- ...4-Fixes-the-Blank-SkullOwner-exploit.patch | 8 ++--- ...Removes-useless-spammy-error-logging.patch | 4 +-- .../0047-Fix-invalid-armor-trim-exploit.patch | 29 ------------------- ...ove-validation-of-ResourceLocations.patch} | 0 ...n-t-log-on-too-many-chained-updates.patch} | 0 ...049-Fix-packet-related-lag-exploits.patch} | 2 +- ...-Limit-save-data-for-Bees-and-Vexes.patch} | 0 ...tch => 0051-Mute-invalid-attributes.patch} | 0 ...052-Mute-invalid-Enderdragon-phases.patch} | 0 10 files changed, 8 insertions(+), 37 deletions(-) delete mode 100644 patches/server/0047-Fix-invalid-armor-trim-exploit.patch rename patches/server/{0048-Improve-validation-of-ResourceLocations.patch => 0047-Improve-validation-of-ResourceLocations.patch} (100%) rename patches/server/{0049-Don-t-log-on-too-many-chained-updates.patch => 0048-Don-t-log-on-too-many-chained-updates.patch} (100%) rename patches/server/{0050-Fix-packet-related-lag-exploits.patch => 0049-Fix-packet-related-lag-exploits.patch} (97%) rename patches/server/{0051-Limit-save-data-for-Bees-and-Vexes.patch => 0050-Limit-save-data-for-Bees-and-Vexes.patch} (100%) rename patches/server/{0052-Mute-invalid-attributes.patch => 0051-Mute-invalid-attributes.patch} (100%) rename patches/server/{0053-Mute-invalid-Enderdragon-phases.patch => 0052-Mute-invalid-Enderdragon-phases.patch} (100%) diff --git a/gradle.properties b/gradle.properties index 0dfee43..4de1bcd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=me.totalfreedom.scissors version=1.20.1-R0.1-SNAPSHOT mcVersion=1.20.1 -paperRef=a3c760e6af1e8c7244ef75c6da6e6df278a79e14 +paperRef=de3f149185a3b654eaf9af1144f4c85b8ef2f9bc org.gradle.caching=true org.gradle.parallel=true diff --git a/patches/server/0004-Fixes-the-Blank-SkullOwner-exploit.patch b/patches/server/0004-Fixes-the-Blank-SkullOwner-exploit.patch index 6a20862..a8453c6 100644 --- a/patches/server/0004-Fixes-the-Blank-SkullOwner-exploit.patch +++ b/patches/server/0004-Fixes-the-Blank-SkullOwner-exploit.patch @@ -5,7 +5,7 @@ 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 deed77a3d44bc55681483d7f47f148b5220135f2..f927156d6d7b75ff9a1c437478ae3e200962398c 100644 +index 47c8148e6413c51ffdd30082bfb37a7fb8a73a71..48fce864be2a92c9665b9eeb85e3193eaed4133d 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java @@ -11,6 +11,7 @@ import net.minecraft.nbt.CompoundTag; @@ -16,12 +16,12 @@ index deed77a3d44bc55681483d7f47f148b5220135f2..f927156d6d7b75ff9a1c437478ae3e20 import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.NamespacedKey; -@@ -73,7 +74,7 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta { - +@@ -74,7 +75,7 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta { + try { // Paper - Ignore invalid game profiles if (tag.contains(SKULL_OWNER.NBT, CraftMagicNumbers.NBT.TAG_COMPOUND)) { this.setProfile(NbtUtils.readGameProfile(tag.getCompound(SKULL_OWNER.NBT))); - } else if (tag.contains(SKULL_OWNER.NBT, CraftMagicNumbers.NBT.TAG_STRING) && !tag.getString(SKULL_OWNER.NBT).isEmpty()) { + } else if (tag.contains(SKULL_OWNER.NBT, CraftMagicNumbers.NBT.TAG_STRING) && !StringUtils.isBlank(tag.getString(SKULL_OWNER.NBT))) { // Scissors this.setProfile(new GameProfile(null, tag.getString(SKULL_OWNER.NBT))); } - + } catch (Exception ignored) {} // Paper diff --git a/patches/server/0006-Removes-useless-spammy-error-logging.patch b/patches/server/0006-Removes-useless-spammy-error-logging.patch index a909d09..8f61674 100644 --- a/patches/server/0006-Removes-useless-spammy-error-logging.patch +++ b/patches/server/0006-Removes-useless-spammy-error-logging.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Removes useless spammy error logging diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -index 1481c8ca684eddca3eb5db3aceac4877043b9fcd..db7d7e2ab25f8559247e2496a54807161e24a203 100644 +index 076e06908a0cf97f86a64a15ca0231c5b0f06fec..3903ca3970db787d96053f8b40044c1dac2c909b 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -@@ -1800,8 +1800,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { +@@ -1807,8 +1807,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { resource = CraftNamespacedKey.fromMinecraft(key); } } catch (IllegalArgumentException ex) { diff --git a/patches/server/0047-Fix-invalid-armor-trim-exploit.patch b/patches/server/0047-Fix-invalid-armor-trim-exploit.patch deleted file mode 100644 index 73c3d7c..0000000 --- a/patches/server/0047-Fix-invalid-armor-trim-exploit.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Luna -Date: Mon, 12 Jun 2023 17:32:04 -0300 -Subject: [PATCH] Fix invalid armor trim exploit - - -diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmor.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmor.java -index c92981aedebe934cefa1c96a0328fb91fe17acbc..2eb3705e1efdd62fa176bf4a1ec126181d083505 100644 ---- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmor.java -+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmor.java -@@ -68,10 +68,15 @@ public class CraftMetaArmor extends CraftMetaItem implements ArmorMeta { - CompoundTag trimCompound = tag.getCompound(TRIM.NBT); - - if (trimCompound.contains(TRIM_MATERIAL.NBT, net.minecraft.nbt.Tag.TAG_STRING) && trimCompound.contains(TRIM_PATTERN.NBT, net.minecraft.nbt.Tag.TAG_STRING)) { // Paper - for now, ignore inline definitions of trim material & pattern -- TrimMaterial trimMaterial = Registry.TRIM_MATERIAL.get(NamespacedKey.fromString(trimCompound.getString(TRIM_MATERIAL.NBT))); -- TrimPattern trimPattern = Registry.TRIM_PATTERN.get(NamespacedKey.fromString(trimCompound.getString(TRIM_PATTERN.NBT))); -+ // Scissors start -+ NamespacedKey trimMaterialKey = NamespacedKey.fromString(trimCompound.getString(TRIM_MATERIAL.NBT)); -+ NamespacedKey trimPatternKey = NamespacedKey.fromString(trimCompound.getString(TRIM_PATTERN.NBT)); - -- this.trim = new ArmorTrim(trimMaterial, trimPattern); -+ TrimMaterial trimMaterial = trimMaterialKey != null ? Registry.TRIM_MATERIAL.get(trimMaterialKey) : null; -+ TrimPattern trimPattern = trimPatternKey != null ? Registry.TRIM_PATTERN.get(trimPatternKey) : null; -+ -+ if (trimMaterial != null && trimPattern != null) this.trim = new ArmorTrim(trimMaterial, trimPattern); -+ // Scissors end - } - } - } diff --git a/patches/server/0048-Improve-validation-of-ResourceLocations.patch b/patches/server/0047-Improve-validation-of-ResourceLocations.patch similarity index 100% rename from patches/server/0048-Improve-validation-of-ResourceLocations.patch rename to patches/server/0047-Improve-validation-of-ResourceLocations.patch diff --git a/patches/server/0049-Don-t-log-on-too-many-chained-updates.patch b/patches/server/0048-Don-t-log-on-too-many-chained-updates.patch similarity index 100% rename from patches/server/0049-Don-t-log-on-too-many-chained-updates.patch rename to patches/server/0048-Don-t-log-on-too-many-chained-updates.patch diff --git a/patches/server/0050-Fix-packet-related-lag-exploits.patch b/patches/server/0049-Fix-packet-related-lag-exploits.patch similarity index 97% rename from patches/server/0050-Fix-packet-related-lag-exploits.patch rename to patches/server/0049-Fix-packet-related-lag-exploits.patch index 0ecd138..6d33969 100644 --- a/patches/server/0050-Fix-packet-related-lag-exploits.patch +++ b/patches/server/0049-Fix-packet-related-lag-exploits.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix packet-related lag exploits diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index fbc247d364d3cdee94b04b1108c99d2909b1773a..17faa1416b1e4145a81a0fff5726c6672abf008b 100644 +index e6ca11d556cd284bd9124111ddcec87fa2175a09..c4ba1bd493db96fd894c432aa6b416f3ccd00b3f 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -965,7 +965,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0051-Limit-save-data-for-Bees-and-Vexes.patch b/patches/server/0050-Limit-save-data-for-Bees-and-Vexes.patch similarity index 100% rename from patches/server/0051-Limit-save-data-for-Bees-and-Vexes.patch rename to patches/server/0050-Limit-save-data-for-Bees-and-Vexes.patch diff --git a/patches/server/0052-Mute-invalid-attributes.patch b/patches/server/0051-Mute-invalid-attributes.patch similarity index 100% rename from patches/server/0052-Mute-invalid-attributes.patch rename to patches/server/0051-Mute-invalid-attributes.patch diff --git a/patches/server/0053-Mute-invalid-Enderdragon-phases.patch b/patches/server/0052-Mute-invalid-Enderdragon-phases.patch similarity index 100% rename from patches/server/0053-Mute-invalid-Enderdragon-phases.patch rename to patches/server/0052-Mute-invalid-Enderdragon-phases.patch