From ec0768f1a523051958d2f9a67d277c34fa4873b6 Mon Sep 17 00:00:00 2001 From: Telesphoreo Date: Sun, 18 Feb 2024 12:44:06 -0600 Subject: [PATCH] Update Paper --- gradle.properties | 2 +- patches/server/0001-Build-changes.patch | 6 +-- .../0004-ResourceLocation-validation.patch | 44 ------------------- ...own-when-trying-to-remove-minecart-.patch} | 2 +- ...Removes-useless-spammy-error-logging.patch | 20 --------- ...if-items-are-air-before-calling-set.patch} | 2 +- ...ooks-causing-log-spam-when-invalid-.patch} | 0 ...te-BlockState-and-SoundEvent-values.patch} | 2 +- ...d-items-in-HoverEvent-and-ItemFrame.patch} | 2 +- ...handling-of-invalid-JSON-components.patch} | 0 ...-oversized-components-from-updating.patch} | 0 ...Scissors-configuration-file-command.patch} | 0 ...=> 0013-Block-server-side-chunkbans.patch} | 0 ...s-with-invalid-namespaces-from-bein.patch} | 2 +- ...ry-player-data-in-the-nbt-component.patch} | 0 ...tring-tag-visitors-to-1024-elements.patch} | 0 ...lling-potion-effects-and-certain-po.patch} | 0 ...ch => 0018-Fix-negative-death-times.patch} | 2 +- ...ehicle-collision-checks-to-3-and-di.patch} | 0 ...Add-custom-classes-used-by-Scissors.patch} | 0 ...tags.patch => 0021-Reset-large-tags.patch} | 2 +- ...-Don-t-log-invalid-teams-to-console.patch} | 2 +- ...-bounds-HangingEntity-crash-exploit.patch} | 0 ...ch => 0024-Add-MasterBlockFireEvent.patch} | 0 ...> 0025-Add-spectator-teleport-event.patch} | 4 +- ...26-Prevent-invalid-container-events.patch} | 4 +- ...unning-commands-in-books-by-default.patch} | 0 ...k-entity-entity-tag-query-positions.patch} | 6 +-- ...-legacy-messages-over-1k-characters.patch} | 0 ...ents-on-Signs-bypassing-permissions.patch} | 2 +- ...tch => 0031-Prevent-velocity-freeze.patch} | 0 ...n-option-to-disable-chat-signatures.patch} | 10 ++--- ...Patch-large-selector-distance-crash.patch} | 0 ...ch-invalid-entity-rotation-log-spam.patch} | 0 ...mit-sculk-catalyst-cursor-positions.patch} | 0 ...patch => 0036-Limit-map-decorations.patch} | 0 ...layer-banning-using-duplicate-UUIDs.patch} | 0 ...on-t-warn-on-duplicate-entity-UUIDs.patch} | 0 ...0039-Implement-command-block-events.patch} | 6 +-- ...tch => 0040-Add-depth-limit-to-SNBT.patch} | 2 +- ...ch => 0041-Limit-beacon-effectRange.patch} | 2 +- ...ove-validation-of-ResourceLocations.patch} | 0 ...n-t-log-on-too-many-chained-updates.patch} | 2 +- ...044-Fix-packet-related-lag-exploits.patch} | 10 ++--- ...-Limit-save-data-for-Bees-and-Vexes.patch} | 2 +- ...tch => 0046-Mute-invalid-attributes.patch} | 0 ...047-Mute-invalid-Enderdragon-phases.patch} | 0 ...dd-length-limit-to-note-block-sound.patch} | 0 ... 0049-Change-version-fetcher-to-AMG.patch} | 0 ...-limit-to-Component-deserialization.patch} | 0 ...limit-to-updateCustomBlockEntityTag.patch} | 0 51 files changed, 37 insertions(+), 101 deletions(-) rename patches/server/{0006-Ignore-errors-thrown-when-trying-to-remove-minecart-.patch => 0005-Ignore-errors-thrown-when-trying-to-remove-minecart-.patch} (92%) delete mode 100644 patches/server/0005-Removes-useless-spammy-error-logging.patch rename patches/server/{0007-ItemEntity-Check-if-items-are-air-before-calling-set.patch => 0006-ItemEntity-Check-if-items-are-air-before-calling-set.patch} (91%) rename patches/server/{0008-Fixes-Knowledge-Books-causing-log-spam-when-invalid-.patch => 0007-Fixes-Knowledge-Books-causing-log-spam-when-invalid-.patch} (100%) rename patches/server/{0009-Validate-BlockState-and-SoundEvent-values.patch => 0008-Validate-BlockState-and-SoundEvent-values.patch} (91%) rename patches/server/{0010-Do-not-log-invalid-items-in-HoverEvent-and-ItemFrame.patch => 0009-Do-not-log-invalid-items-in-HoverEvent-and-ItemFrame.patch} (94%) rename patches/server/{0011-Better-handling-of-invalid-JSON-components.patch => 0010-Better-handling-of-invalid-JSON-components.patch} (100%) rename patches/server/{0012-Reject-oversized-components-from-updating.patch => 0011-Reject-oversized-components-from-updating.patch} (100%) rename patches/server/{0013-Add-Scissors-configuration-file-command.patch => 0012-Add-Scissors-configuration-file-command.patch} (100%) rename patches/server/{0014-Block-server-side-chunkbans.patch => 0013-Block-server-side-chunkbans.patch} (100%) rename patches/server/{0015-Prevent-attributes-with-invalid-namespaces-from-bein.patch => 0014-Prevent-attributes-with-invalid-namespaces-from-bein.patch} (94%) rename patches/server/{0016-Don-t-query-player-data-in-the-nbt-component.patch => 0015-Don-t-query-player-data-in-the-nbt-component.patch} (100%) rename patches/server/{0017-Limit-string-tag-visitors-to-1024-elements.patch => 0016-Limit-string-tag-visitors-to-1024-elements.patch} (100%) rename patches/server/{0018-Fixes-creative-killing-potion-effects-and-certain-po.patch => 0017-Fixes-creative-killing-potion-effects-and-certain-po.patch} (100%) rename patches/server/{0019-Fix-negative-death-times.patch => 0018-Fix-negative-death-times.patch} (90%) rename patches/server/{0020-Limit-amount-of-vehicle-collision-checks-to-3-and-di.patch => 0019-Limit-amount-of-vehicle-collision-checks-to-3-and-di.patch} (100%) rename patches/server/{0021-Add-custom-classes-used-by-Scissors.patch => 0020-Add-custom-classes-used-by-Scissors.patch} (100%) rename patches/server/{0022-Reset-large-tags.patch => 0021-Reset-large-tags.patch} (99%) rename patches/server/{0023-Don-t-log-invalid-teams-to-console.patch => 0022-Don-t-log-invalid-teams-to-console.patch} (91%) rename patches/server/{0024-Fixes-out-of-bounds-HangingEntity-crash-exploit.patch => 0023-Fixes-out-of-bounds-HangingEntity-crash-exploit.patch} (100%) rename patches/server/{0025-Add-MasterBlockFireEvent.patch => 0024-Add-MasterBlockFireEvent.patch} (100%) rename patches/server/{0026-Add-spectator-teleport-event.patch => 0025-Add-spectator-teleport-event.patch} (90%) rename patches/server/{0027-Prevent-invalid-container-events.patch => 0026-Prevent-invalid-container-events.patch} (91%) rename patches/server/{0028-Disable-running-commands-in-books-by-default.patch => 0027-Disable-running-commands-in-books-by-default.patch} (100%) rename patches/server/{0029-Validate-block-entity-entity-tag-query-positions.patch => 0028-Validate-block-entity-entity-tag-query-positions.patch} (89%) rename patches/server/{0030-Refuse-to-convert-legacy-messages-over-1k-characters.patch => 0029-Refuse-to-convert-legacy-messages-over-1k-characters.patch} (100%) rename patches/server/{0031-Fix-ClickEvents-on-Signs-bypassing-permissions.patch => 0030-Fix-ClickEvents-on-Signs-bypassing-permissions.patch} (97%) rename patches/server/{0032-Prevent-velocity-freeze.patch => 0031-Prevent-velocity-freeze.patch} (100%) rename patches/server/{0033-Add-configuration-option-to-disable-chat-signatures.patch => 0032-Add-configuration-option-to-disable-chat-signatures.patch} (94%) rename patches/server/{0034-Patch-large-selector-distance-crash.patch => 0033-Patch-large-selector-distance-crash.patch} (100%) rename patches/server/{0035-Patch-invalid-entity-rotation-log-spam.patch => 0034-Patch-invalid-entity-rotation-log-spam.patch} (100%) rename patches/server/{0036-Limit-sculk-catalyst-cursor-positions.patch => 0035-Limit-sculk-catalyst-cursor-positions.patch} (100%) rename patches/server/{0037-Limit-map-decorations.patch => 0036-Limit-map-decorations.patch} (100%) rename patches/server/{0038-Prevent-player-banning-using-duplicate-UUIDs.patch => 0037-Prevent-player-banning-using-duplicate-UUIDs.patch} (100%) rename patches/server/{0039-Don-t-warn-on-duplicate-entity-UUIDs.patch => 0038-Don-t-warn-on-duplicate-entity-UUIDs.patch} (100%) rename patches/server/{0040-Implement-command-block-events.patch => 0039-Implement-command-block-events.patch} (95%) rename patches/server/{0041-Add-depth-limit-to-SNBT.patch => 0040-Add-depth-limit-to-SNBT.patch} (97%) rename patches/server/{0042-Limit-beacon-effectRange.patch => 0041-Limit-beacon-effectRange.patch} (93%) rename patches/server/{0043-Improve-validation-of-ResourceLocations.patch => 0042-Improve-validation-of-ResourceLocations.patch} (100%) rename patches/server/{0044-Don-t-log-on-too-many-chained-updates.patch => 0043-Don-t-log-on-too-many-chained-updates.patch} (90%) rename patches/server/{0045-Fix-packet-related-lag-exploits.patch => 0044-Fix-packet-related-lag-exploits.patch} (89%) rename patches/server/{0046-Limit-save-data-for-Bees-and-Vexes.patch => 0045-Limit-save-data-for-Bees-and-Vexes.patch} (96%) rename patches/server/{0047-Mute-invalid-attributes.patch => 0046-Mute-invalid-attributes.patch} (100%) rename patches/server/{0048-Mute-invalid-Enderdragon-phases.patch => 0047-Mute-invalid-Enderdragon-phases.patch} (100%) rename patches/server/{0049-Add-length-limit-to-note-block-sound.patch => 0048-Add-length-limit-to-note-block-sound.patch} (100%) rename patches/server/{0050-Change-version-fetcher-to-AMG.patch => 0049-Change-version-fetcher-to-AMG.patch} (100%) rename patches/server/{0051-Add-depth-limit-to-Component-deserialization.patch => 0050-Add-depth-limit-to-Component-deserialization.patch} (100%) rename patches/server/{0052-Add-depth-limit-to-updateCustomBlockEntityTag.patch => 0051-Add-depth-limit-to-updateCustomBlockEntityTag.patch} (100%) diff --git a/gradle.properties b/gradle.properties index e5a44e5..2586418 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=me.totalfreedom.scissors version=1.20.4-R0.1-SNAPSHOT mcVersion=1.20.4 -paperRef=7ccefdcd6cf6f467a3212fa02a75a8b9322f3582 +paperRef=4939f8711884901ddf1c56337f606de71cdae78d org.gradle.caching=true org.gradle.parallel=true diff --git a/patches/server/0001-Build-changes.patch b/patches/server/0001-Build-changes.patch index 24279ac..abdea70 100644 --- a/patches/server/0001-Build-changes.patch +++ b/patches/server/0001-Build-changes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Build changes diff --git a/build.gradle.kts b/build.gradle.kts -index 376e8983fdfdbb6c3e5fd8ad0f6a05e655b622bf..ee0eb76093a60655e364626e87c05df4c43b70dc 100644 +index ce3747d8d2a8f4327766cf23d5aaa72cfcb380bc..32118caeb0fa211def89c7f83563d38b8c317ca3 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -13,8 +13,12 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) { @@ -23,7 +23,7 @@ index 376e8983fdfdbb6c3e5fd8ad0f6a05e655b622bf..ee0eb76093a60655e364626e87c05df4 // Paper start implementation("org.jline:jline-terminal-jansi:3.21.0") implementation("net.minecrell:terminalconsoleappender:1.3.0") -@@ -65,11 +69,19 @@ tasks.jar { +@@ -66,11 +70,19 @@ tasks.jar { val gitHash = git("rev-parse", "--short=7", "HEAD").getText().trim() val implementationVersion = System.getenv("BUILD_NUMBER") ?: "\"$gitHash\"" val date = git("show", "-s", "--format=%ci", gitHash).getText().trim() // Paper @@ -45,7 +45,7 @@ index 376e8983fdfdbb6c3e5fd8ad0f6a05e655b622bf..ee0eb76093a60655e364626e87c05df4 "Implementation-Vendor" to date, // Paper "Specification-Title" to "Bukkit", "Specification-Version" to project.version, -@@ -153,7 +165,7 @@ fun TaskContainer.registerRunTask( +@@ -154,7 +166,7 @@ fun TaskContainer.registerRunTask( name: String, block: JavaExec.() -> Unit ): TaskProvider = register(name) { diff --git a/patches/server/0004-ResourceLocation-validation.patch b/patches/server/0004-ResourceLocation-validation.patch index df1e860..562acf1 100644 --- a/patches/server/0004-ResourceLocation-validation.patch +++ b/patches/server/0004-ResourceLocation-validation.patch @@ -56,50 +56,6 @@ index 09e8445a3f8c6b3ebc852a75a9a25b41a51ba659..cfb2ce684da0ae97a844554b5ad3d412 }); } -diff --git a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java -index d04fc84eef11adb5ea64077f48794b6ed7fb3ada..c4b972846200b1e3fb84c75c200122906f84a245 100644 ---- a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java -+++ b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java -@@ -290,7 +290,12 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit - while (iterator.hasNext()) { - String s = (String) iterator.next(); - -- this.recipesUsed.put(new ResourceLocation(s), nbttagcompound1.getInt(s)); -+ // Scissors start -+ final ResourceLocation rl = ResourceLocation.tryParse(s); -+ if (rl != null) { -+ this.recipesUsed.put(rl, nbttagcompound1.getInt(s)); -+ } -+ // Scissors end - } - - // Paper start - cook speed multiplier API -diff --git a/src/main/java/net/minecraft/world/level/block/entity/BrushableBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BrushableBlockEntity.java -index b5b1831631e233a96b6fd55972a8862b0f420da8..a086f12c09a5e38f63c8de118fcb5a6a30e40b52 100644 ---- a/src/main/java/net/minecraft/world/level/block/entity/BrushableBlockEntity.java -+++ b/src/main/java/net/minecraft/world/level/block/entity/BrushableBlockEntity.java -@@ -199,7 +199,7 @@ public class BrushableBlockEntity extends BlockEntity { - - private boolean tryLoadLootTable(CompoundTag nbt) { - if (nbt.contains("LootTable", 8)) { -- this.lootTable = new ResourceLocation(nbt.getString("LootTable")); -+ this.lootTable = ResourceLocation.tryParse(nbt.getString("LootTable")); // Scissors - this.lootTableSeed = nbt.getLong("LootTableSeed"); - return true; - } else { -diff --git a/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java -index a94300a457b25f0e33a8eeabba6dd5720ca9ab1e..de300a7888f95e7770690ecdc36e44803e3634fd 100644 ---- a/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java -+++ b/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java -@@ -50,7 +50,7 @@ public abstract class RandomizableContainerBlockEntity extends BaseContainerBloc - // Copied from super with changes, always check the original method - this.lootableData.loadNbt(nbt); // Paper - if (nbt.contains("LootTable", 8)) { -- this.setLootTable(new ResourceLocation(nbt.getString("LootTable"))); -+ this.setLootTable(ResourceLocation.tryParse((nbt.getString("LootTable")))); // Scissors - Validate loot tables - try { org.bukkit.craftbukkit.util.CraftNamespacedKey.fromMinecraft(this.lootTable); } catch (IllegalArgumentException ex) { this.lootTable = null; } // Paper - validate - this.setLootTableSeed(nbt.getLong("LootTableSeed")); - return false; // Paper - always load the items, table may still remain diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftLootable.java b/src/main/java/org/bukkit/craftbukkit/block/CraftLootable.java index f6942cb3ef1f9ef03708d4bc932ea9aeb1c13894..8b32864bafb3c1948993688be8f639dd6492057e 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftLootable.java diff --git a/patches/server/0006-Ignore-errors-thrown-when-trying-to-remove-minecart-.patch b/patches/server/0005-Ignore-errors-thrown-when-trying-to-remove-minecart-.patch similarity index 92% rename from patches/server/0006-Ignore-errors-thrown-when-trying-to-remove-minecart-.patch rename to patches/server/0005-Ignore-errors-thrown-when-trying-to-remove-minecart-.patch index f75a7c5..39f73fb 100644 --- a/patches/server/0006-Ignore-errors-thrown-when-trying-to-remove-minecart-.patch +++ b/patches/server/0005-Ignore-errors-thrown-when-trying-to-remove-minecart-.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Ignore errors thrown when trying to remove minecart entities diff --git a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java -index 272095d7a09ab41227d741172735f66fd2798ce1..757ae1773ba35c2348483dddbb231060afafc602 100644 +index 6d23c39e4eadf23616080d6d08672e13b5d3c37d..0bd5c3e3bb7074b5265e3f1bf670f993c9fe167d 100644 --- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java +++ b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java @@ -139,7 +139,11 @@ public abstract class AbstractMinecartContainer extends AbstractMinecart impleme diff --git a/patches/server/0005-Removes-useless-spammy-error-logging.patch b/patches/server/0005-Removes-useless-spammy-error-logging.patch deleted file mode 100644 index 753e01b..0000000 --- a/patches/server/0005-Removes-useless-spammy-error-logging.patch +++ /dev/null @@ -1,20 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Video -Date: Sun, 10 Dec 2023 16:58:55 -0600 -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 536e80886c2393edaf526f460f49dae8c3b40295..247069ed3bead0e96a5d89a3e703e4760147f43b 100644 ---- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -@@ -1813,8 +1813,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { - resource = CraftNamespacedKey.fromMinecraft(key); - } - } catch (IllegalArgumentException ex) { -- org.bukkit.Bukkit.getLogger().warning("Namespaced resource does not validate: " + key.toString()); -- ex.printStackTrace(); -+ // Scissors - Don't log errors thrown by invalid namespaces when an error is thrown - } - - return resource; diff --git a/patches/server/0007-ItemEntity-Check-if-items-are-air-before-calling-set.patch b/patches/server/0006-ItemEntity-Check-if-items-are-air-before-calling-set.patch similarity index 91% rename from patches/server/0007-ItemEntity-Check-if-items-are-air-before-calling-set.patch rename to patches/server/0006-ItemEntity-Check-if-items-are-air-before-calling-set.patch index 852422a..61f9896 100644 --- a/patches/server/0007-ItemEntity-Check-if-items-are-air-before-calling-set.patch +++ b/patches/server/0006-ItemEntity-Check-if-items-are-air-before-calling-set.patch @@ -5,7 +5,7 @@ Subject: [PATCH] ItemEntity - Check if items are air before calling setItem diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java -index a39db702063887cf530f272deaf4f334047cc7d4..1816d8bc0716d06cb3db37730234bd37b100f573 100644 +index eb0d6238588efa35fa868f26290547574a08eca2..83fd3204169801e18a355db5a547acc0157a50be 100644 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java @@ -444,11 +444,15 @@ public class ItemEntity extends Entity implements TraceableEntity { diff --git a/patches/server/0008-Fixes-Knowledge-Books-causing-log-spam-when-invalid-.patch b/patches/server/0007-Fixes-Knowledge-Books-causing-log-spam-when-invalid-.patch similarity index 100% rename from patches/server/0008-Fixes-Knowledge-Books-causing-log-spam-when-invalid-.patch rename to patches/server/0007-Fixes-Knowledge-Books-causing-log-spam-when-invalid-.patch diff --git a/patches/server/0009-Validate-BlockState-and-SoundEvent-values.patch b/patches/server/0008-Validate-BlockState-and-SoundEvent-values.patch similarity index 91% rename from patches/server/0009-Validate-BlockState-and-SoundEvent-values.patch rename to patches/server/0008-Validate-BlockState-and-SoundEvent-values.patch index 08f34c9..7e0223f 100644 --- a/patches/server/0009-Validate-BlockState-and-SoundEvent-values.patch +++ b/patches/server/0008-Validate-BlockState-and-SoundEvent-values.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Validate BlockState and SoundEvent values diff --git a/src/main/java/net/minecraft/nbt/NbtUtils.java b/src/main/java/net/minecraft/nbt/NbtUtils.java -index 8e68a094a22243f3e84110ddf81136219ac1de7c..807194e1c4d4b6808e60b2db57b596c7de5c27de 100644 +index e3a3f19a6e63fd42e29c418e5a7439972484d492..39866c58f9dbca9b4f0018922eac076c64ffbdae 100644 --- a/src/main/java/net/minecraft/nbt/NbtUtils.java +++ b/src/main/java/net/minecraft/nbt/NbtUtils.java @@ -231,7 +231,7 @@ public final class NbtUtils { diff --git a/patches/server/0010-Do-not-log-invalid-items-in-HoverEvent-and-ItemFrame.patch b/patches/server/0009-Do-not-log-invalid-items-in-HoverEvent-and-ItemFrame.patch similarity index 94% rename from patches/server/0010-Do-not-log-invalid-items-in-HoverEvent-and-ItemFrame.patch rename to patches/server/0009-Do-not-log-invalid-items-in-HoverEvent-and-ItemFrame.patch index fb699dc..65a4699 100644 --- a/patches/server/0010-Do-not-log-invalid-items-in-HoverEvent-and-ItemFrame.patch +++ b/patches/server/0009-Do-not-log-invalid-items-in-HoverEvent-and-ItemFrame.patch @@ -18,7 +18,7 @@ index b2cc15da40aa7bbcfc234b4e147ed0e53f359efa..dbe9f81e298a931c3e0e5b879dc13b49 } } diff --git a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java -index 69912c5b300b67394dce3876d2d96872033cf156..ebc403ff31385a12e072fd6a419a7787ee76429e 100644 +index 80303f9466b8c7097151be313afc9a383693d18a..a5235e9035768a588af522af645fa136c9c897cf 100644 --- a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java +++ b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java @@ -436,7 +436,7 @@ public class ItemFrame extends HangingEntity { diff --git a/patches/server/0011-Better-handling-of-invalid-JSON-components.patch b/patches/server/0010-Better-handling-of-invalid-JSON-components.patch similarity index 100% rename from patches/server/0011-Better-handling-of-invalid-JSON-components.patch rename to patches/server/0010-Better-handling-of-invalid-JSON-components.patch diff --git a/patches/server/0012-Reject-oversized-components-from-updating.patch b/patches/server/0011-Reject-oversized-components-from-updating.patch similarity index 100% rename from patches/server/0012-Reject-oversized-components-from-updating.patch rename to patches/server/0011-Reject-oversized-components-from-updating.patch diff --git a/patches/server/0013-Add-Scissors-configuration-file-command.patch b/patches/server/0012-Add-Scissors-configuration-file-command.patch similarity index 100% rename from patches/server/0013-Add-Scissors-configuration-file-command.patch rename to patches/server/0012-Add-Scissors-configuration-file-command.patch diff --git a/patches/server/0014-Block-server-side-chunkbans.patch b/patches/server/0013-Block-server-side-chunkbans.patch similarity index 100% rename from patches/server/0014-Block-server-side-chunkbans.patch rename to patches/server/0013-Block-server-side-chunkbans.patch diff --git a/patches/server/0015-Prevent-attributes-with-invalid-namespaces-from-bein.patch b/patches/server/0014-Prevent-attributes-with-invalid-namespaces-from-bein.patch similarity index 94% rename from patches/server/0015-Prevent-attributes-with-invalid-namespaces-from-bein.patch rename to patches/server/0014-Prevent-attributes-with-invalid-namespaces-from-bein.patch index e4d01e1..10d048e 100644 --- a/patches/server/0015-Prevent-attributes-with-invalid-namespaces-from-bein.patch +++ b/patches/server/0014-Prevent-attributes-with-invalid-namespaces-from-bein.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Prevent attributes with invalid namespaces from being applied diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -index 94155519f6838bb971a6fc50d4dd46d8b21187bf..d9d5c72a46798c0611c99dcf0413f7e47ebd29d5 100644 +index 5cd0fbac267f9c69c5de4c200a95860f5c56d42e..f2ccf2af05524be91eb0f4855cb8006dea2aede4 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java @@ -47,6 +47,7 @@ import net.minecraft.nbt.NbtIo; diff --git a/patches/server/0016-Don-t-query-player-data-in-the-nbt-component.patch b/patches/server/0015-Don-t-query-player-data-in-the-nbt-component.patch similarity index 100% rename from patches/server/0016-Don-t-query-player-data-in-the-nbt-component.patch rename to patches/server/0015-Don-t-query-player-data-in-the-nbt-component.patch diff --git a/patches/server/0017-Limit-string-tag-visitors-to-1024-elements.patch b/patches/server/0016-Limit-string-tag-visitors-to-1024-elements.patch similarity index 100% rename from patches/server/0017-Limit-string-tag-visitors-to-1024-elements.patch rename to patches/server/0016-Limit-string-tag-visitors-to-1024-elements.patch diff --git a/patches/server/0018-Fixes-creative-killing-potion-effects-and-certain-po.patch b/patches/server/0017-Fixes-creative-killing-potion-effects-and-certain-po.patch similarity index 100% rename from patches/server/0018-Fixes-creative-killing-potion-effects-and-certain-po.patch rename to patches/server/0017-Fixes-creative-killing-potion-effects-and-certain-po.patch diff --git a/patches/server/0019-Fix-negative-death-times.patch b/patches/server/0018-Fix-negative-death-times.patch similarity index 90% rename from patches/server/0019-Fix-negative-death-times.patch rename to patches/server/0018-Fix-negative-death-times.patch index f1f59a5..b7efa29 100644 --- a/patches/server/0019-Fix-negative-death-times.patch +++ b/patches/server/0018-Fix-negative-death-times.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix negative death times diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 902c0e7f2a167845f46adef4578bc71ca8cabfe8..454099b94ecf0f93f4d646610696b7af212b2170 100644 +index aceee33eebd4d5f89e62a42910ec51843f33843b..41efa95605aff3bad72dfd4ec1a5555a3abff284 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -628,7 +628,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0020-Limit-amount-of-vehicle-collision-checks-to-3-and-di.patch b/patches/server/0019-Limit-amount-of-vehicle-collision-checks-to-3-and-di.patch similarity index 100% rename from patches/server/0020-Limit-amount-of-vehicle-collision-checks-to-3-and-di.patch rename to patches/server/0019-Limit-amount-of-vehicle-collision-checks-to-3-and-di.patch diff --git a/patches/server/0021-Add-custom-classes-used-by-Scissors.patch b/patches/server/0020-Add-custom-classes-used-by-Scissors.patch similarity index 100% rename from patches/server/0021-Add-custom-classes-used-by-Scissors.patch rename to patches/server/0020-Add-custom-classes-used-by-Scissors.patch diff --git a/patches/server/0022-Reset-large-tags.patch b/patches/server/0021-Reset-large-tags.patch similarity index 99% rename from patches/server/0022-Reset-large-tags.patch rename to patches/server/0021-Reset-large-tags.patch index e169921..064be7a 100644 --- a/patches/server/0022-Reset-large-tags.patch +++ b/patches/server/0021-Reset-large-tags.patch @@ -105,7 +105,7 @@ index 1ad126d992d95062a3db08374db7a927f23a0cac..345fb9722f1dc8293809256d3bb87b89 this.processEnchantOrder(this.tag); // Paper if (this.getItem().canBeDepleted()) { diff --git a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java -index c4b972846200b1e3fb84c75c200122906f84a245..a53b3a3102e5b3e7860bb51f5af4faeecb0474c0 100644 +index 89d06253b00604114e543ebbe12a9993ae95dc41..2f17fa399dfff7e260fe552147fe88699ebff73e 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java @@ -9,6 +9,7 @@ import java.util.Iterator; diff --git a/patches/server/0023-Don-t-log-invalid-teams-to-console.patch b/patches/server/0022-Don-t-log-invalid-teams-to-console.patch similarity index 91% rename from patches/server/0023-Don-t-log-invalid-teams-to-console.patch rename to patches/server/0022-Don-t-log-invalid-teams-to-console.patch index ae0111b..c32701e 100644 --- a/patches/server/0023-Don-t-log-invalid-teams-to-console.patch +++ b/patches/server/0022-Don-t-log-invalid-teams-to-console.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Don't log invalid teams to console diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 454099b94ecf0f93f4d646610696b7af212b2170..0cadc29b9741b339d9a86f51b2009a645d0584c0 100644 +index 41efa95605aff3bad72dfd4ec1a5555a3abff284..a4b89ac2bffb29e9f952b1ef3f0e08c1f6060118 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -861,7 +861,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0024-Fixes-out-of-bounds-HangingEntity-crash-exploit.patch b/patches/server/0023-Fixes-out-of-bounds-HangingEntity-crash-exploit.patch similarity index 100% rename from patches/server/0024-Fixes-out-of-bounds-HangingEntity-crash-exploit.patch rename to patches/server/0023-Fixes-out-of-bounds-HangingEntity-crash-exploit.patch diff --git a/patches/server/0025-Add-MasterBlockFireEvent.patch b/patches/server/0024-Add-MasterBlockFireEvent.patch similarity index 100% rename from patches/server/0025-Add-MasterBlockFireEvent.patch rename to patches/server/0024-Add-MasterBlockFireEvent.patch diff --git a/patches/server/0026-Add-spectator-teleport-event.patch b/patches/server/0025-Add-spectator-teleport-event.patch similarity index 90% rename from patches/server/0026-Add-spectator-teleport-event.patch rename to patches/server/0025-Add-spectator-teleport-event.patch index 25e1862..c293c39 100644 --- a/patches/server/0026-Add-spectator-teleport-event.patch +++ b/patches/server/0025-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 a7e40f72a3b56916620a7f089410ec3a6db0cffc..912e3474b476fc09a23cc61644bc4c91be95c511 100644 +index ab5b259d8f72022c875cae73be25fe2da346c6b3..1c2b3042b0d7b012876e3d4aab4521915d2cda18 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 a7e40f72a3b56916620a7f089410ec3a6db0cffc..912e3474b476fc09a23cc61644bc4c91 import com.google.common.collect.Lists; import com.google.common.primitives.Floats; import com.mojang.authlib.GameProfile; -@@ -2037,6 +2038,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -2033,6 +2034,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl Entity entity = packet.getEntity(worldserver); if (entity != null) { diff --git a/patches/server/0027-Prevent-invalid-container-events.patch b/patches/server/0026-Prevent-invalid-container-events.patch similarity index 91% rename from patches/server/0027-Prevent-invalid-container-events.patch rename to patches/server/0026-Prevent-invalid-container-events.patch index c80d1ee..9625576 100644 --- a/patches/server/0027-Prevent-invalid-container-events.patch +++ b/patches/server/0026-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 912e3474b476fc09a23cc61644bc4c91be95c511..6b51a768e395ef49bc482769c91011f6b95c763b 100644 +index 1c2b3042b0d7b012876e3d4aab4521915d2cda18..a66ec293947fc852104dce93a418771b2f44106d 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -29,6 +29,7 @@ import java.util.function.UnaryOperator; @@ -16,7 +16,7 @@ index 912e3474b476fc09a23cc61644bc4c91be95c511..6b51a768e395ef49bc482769c91011f6 import net.minecraft.ChatFormatting; import net.minecraft.SharedConstants; import net.minecraft.Util; -@@ -2898,6 +2899,18 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -2894,6 +2895,18 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl return; } diff --git a/patches/server/0028-Disable-running-commands-in-books-by-default.patch b/patches/server/0027-Disable-running-commands-in-books-by-default.patch similarity index 100% rename from patches/server/0028-Disable-running-commands-in-books-by-default.patch rename to patches/server/0027-Disable-running-commands-in-books-by-default.patch diff --git a/patches/server/0029-Validate-block-entity-entity-tag-query-positions.patch b/patches/server/0028-Validate-block-entity-entity-tag-query-positions.patch similarity index 89% rename from patches/server/0029-Validate-block-entity-entity-tag-query-positions.patch rename to patches/server/0028-Validate-block-entity-entity-tag-query-positions.patch index f29bebd..4406477 100644 --- a/patches/server/0029-Validate-block-entity-entity-tag-query-positions.patch +++ b/patches/server/0028-Validate-block-entity-entity-tag-query-positions.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Validate block entity/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 6b51a768e395ef49bc482769c91011f6b95c763b..b5a7d005924113baab431797f8729e5c768a2ef1 100644 +index a66ec293947fc852104dce93a418771b2f44106d..b324e9ac6bbbe691c0b3c2994f326c0aa06d7dd7 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -1282,7 +1282,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -1278,7 +1278,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl if (this.player.hasPermissions(2)) { Entity entity = this.player.level().getEntity(packet.getEntityId()); @@ -17,7 +17,7 @@ index 6b51a768e395ef49bc482769c91011f6b95c763b..b5a7d005924113baab431797f8729e5c CompoundTag nbttagcompound = entity.saveWithoutId(new CompoundTag()); this.player.connection.send(new ClientboundTagQueryPacket(packet.getTransactionId(), nbttagcompound)); -@@ -1314,7 +1314,10 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -1310,7 +1310,10 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl @Override public void handleBlockEntityTagQuery(ServerboundBlockEntityTagQuery packet) { PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel()); diff --git a/patches/server/0030-Refuse-to-convert-legacy-messages-over-1k-characters.patch b/patches/server/0029-Refuse-to-convert-legacy-messages-over-1k-characters.patch similarity index 100% rename from patches/server/0030-Refuse-to-convert-legacy-messages-over-1k-characters.patch rename to patches/server/0029-Refuse-to-convert-legacy-messages-over-1k-characters.patch diff --git a/patches/server/0031-Fix-ClickEvents-on-Signs-bypassing-permissions.patch b/patches/server/0030-Fix-ClickEvents-on-Signs-bypassing-permissions.patch similarity index 97% rename from patches/server/0031-Fix-ClickEvents-on-Signs-bypassing-permissions.patch rename to patches/server/0030-Fix-ClickEvents-on-Signs-bypassing-permissions.patch index 2b0a29e..e528bd0 100644 --- a/patches/server/0031-Fix-ClickEvents-on-Signs-bypassing-permissions.patch +++ b/patches/server/0030-Fix-ClickEvents-on-Signs-bypassing-permissions.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix ClickEvents on Signs bypassing permissions diff --git a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java -index 979a8f472f866130a3abb10f535df757eaa50c20..382350d68ec1f1e24cba3a66aa90962bda42e187 100644 +index 927c7ea03560be0c86884cec70ee8e408e66cb07..c4bb1739ddcfd473ef788f97afa1019e24da8561 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java @@ -8,8 +8,10 @@ import java.util.Objects; diff --git a/patches/server/0032-Prevent-velocity-freeze.patch b/patches/server/0031-Prevent-velocity-freeze.patch similarity index 100% rename from patches/server/0032-Prevent-velocity-freeze.patch rename to patches/server/0031-Prevent-velocity-freeze.patch diff --git a/patches/server/0033-Add-configuration-option-to-disable-chat-signatures.patch b/patches/server/0032-Add-configuration-option-to-disable-chat-signatures.patch similarity index 94% rename from patches/server/0033-Add-configuration-option-to-disable-chat-signatures.patch rename to patches/server/0032-Add-configuration-option-to-disable-chat-signatures.patch index 71ba643..52f8458 100644 --- a/patches/server/0033-Add-configuration-option-to-disable-chat-signatures.patch +++ b/patches/server/0032-Add-configuration-option-to-disable-chat-signatures.patch @@ -62,7 +62,7 @@ index ba12919c3f9aec34a9e64993b143ae92be5eb172..bdfa4a7f5b50e80195e79a6dd1204cb7 } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index b5a7d005924113baab431797f8729e5c768a2ef1..0a73b464d696b85d94b9a4a0ee155d5b395cf590 100644 +index b324e9ac6bbbe691c0b3c2994f326c0aa06d7dd7..f2c3b81779bbd2c52068750e65e66e1ca6c4d492 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 @@ @@ -72,7 +72,7 @@ index b5a7d005924113baab431797f8729e5c768a2ef1..0a73b464d696b85d94b9a4a0ee155d5b import me.totalfreedom.scissors.event.player.SpectatorTeleportEvent; // Scissors import com.google.common.collect.Lists; import com.google.common.primitives.Floats; -@@ -2247,7 +2248,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -2243,7 +2244,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl private void handleMessageDecodeFailure(SignedMessageChain.DecodeException exception) { ServerGamePacketListenerImpl.LOGGER.warn("Failed to update secure chat state for {}: '{}'", this.player.getGameProfile().getName(), exception.getComponent().getString()); @@ -81,7 +81,7 @@ index b5a7d005924113baab431797f8729e5c768a2ef1..0a73b464d696b85d94b9a4a0ee155d5b this.disconnect(exception.getComponent(), exception.kickCause); // Paper - kick event causes } else { this.player.sendSystemMessage(exception.getComponent().copy().withStyle(ChatFormatting.RED)); -@@ -2295,6 +2296,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -2291,6 +2292,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl Optional optional = this.lastSeenMessages.applyUpdate(acknowledgment); if (optional.isEmpty()) { @@ -89,7 +89,7 @@ index b5a7d005924113baab431797f8729e5c768a2ef1..0a73b464d696b85d94b9a4a0ee155d5b ServerGamePacketListenerImpl.LOGGER.warn("Failed to validate message acknowledgements from {}", this.player.getName().getString()); this.disconnect(ServerGamePacketListenerImpl.CHAT_VALIDATION_FAILED, org.bukkit.event.player.PlayerKickEvent.Cause.CHAT_VALIDATION_FAILED); // Paper - kick event causes } -@@ -2493,6 +2495,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -2489,6 +2491,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl synchronized (this.lastSeenMessages) { if (!this.lastSeenMessages.applyOffset(packet.offset())) { @@ -97,7 +97,7 @@ index b5a7d005924113baab431797f8729e5c768a2ef1..0a73b464d696b85d94b9a4a0ee155d5b ServerGamePacketListenerImpl.LOGGER.warn("Failed to validate message acknowledgements from {}", this.player.getName().getString()); this.disconnect(ServerGamePacketListenerImpl.CHAT_VALIDATION_FAILED, org.bukkit.event.player.PlayerKickEvent.Cause.CHAT_VALIDATION_FAILED); // Paper - kick event causes } -@@ -3460,6 +3463,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -3456,6 +3459,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl @Override public void handleChatSessionUpdate(ServerboundChatSessionUpdatePacket packet) { PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel()); diff --git a/patches/server/0034-Patch-large-selector-distance-crash.patch b/patches/server/0033-Patch-large-selector-distance-crash.patch similarity index 100% rename from patches/server/0034-Patch-large-selector-distance-crash.patch rename to patches/server/0033-Patch-large-selector-distance-crash.patch diff --git a/patches/server/0035-Patch-invalid-entity-rotation-log-spam.patch b/patches/server/0034-Patch-invalid-entity-rotation-log-spam.patch similarity index 100% rename from patches/server/0035-Patch-invalid-entity-rotation-log-spam.patch rename to patches/server/0034-Patch-invalid-entity-rotation-log-spam.patch diff --git a/patches/server/0036-Limit-sculk-catalyst-cursor-positions.patch b/patches/server/0035-Limit-sculk-catalyst-cursor-positions.patch similarity index 100% rename from patches/server/0036-Limit-sculk-catalyst-cursor-positions.patch rename to patches/server/0035-Limit-sculk-catalyst-cursor-positions.patch diff --git a/patches/server/0037-Limit-map-decorations.patch b/patches/server/0036-Limit-map-decorations.patch similarity index 100% rename from patches/server/0037-Limit-map-decorations.patch rename to patches/server/0036-Limit-map-decorations.patch diff --git a/patches/server/0038-Prevent-player-banning-using-duplicate-UUIDs.patch b/patches/server/0037-Prevent-player-banning-using-duplicate-UUIDs.patch similarity index 100% rename from patches/server/0038-Prevent-player-banning-using-duplicate-UUIDs.patch rename to patches/server/0037-Prevent-player-banning-using-duplicate-UUIDs.patch diff --git a/patches/server/0039-Don-t-warn-on-duplicate-entity-UUIDs.patch b/patches/server/0038-Don-t-warn-on-duplicate-entity-UUIDs.patch similarity index 100% rename from patches/server/0039-Don-t-warn-on-duplicate-entity-UUIDs.patch rename to patches/server/0038-Don-t-warn-on-duplicate-entity-UUIDs.patch diff --git a/patches/server/0040-Implement-command-block-events.patch b/patches/server/0039-Implement-command-block-events.patch similarity index 95% rename from patches/server/0040-Implement-command-block-events.patch rename to patches/server/0039-Implement-command-block-events.patch index a11e06d..6e7398a 100644 --- a/patches/server/0040-Implement-command-block-events.patch +++ b/patches/server/0039-Implement-command-block-events.patch @@ -18,7 +18,7 @@ index c99fc118013cb3d4043638e2001a8297e79ddf9c..cdaa81e1f2167b29ec01cc25e51a8400 private final boolean trackOutput; diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 0a73b464d696b85d94b9a4a0ee155d5b395cf590..eb0316f0825ab0304b872507e7b3cf6a4ef86ae1 100644 +index f2c3b81779bbd2c52068750e65e66e1ca6c4d492..b69f7c74fe4e2ec6280ebee27f8b8fd0ec8ac361 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1,6 +1,8 @@ @@ -47,7 +47,7 @@ index 0a73b464d696b85d94b9a4a0ee155d5b395cf590..eb0316f0825ab0304b872507e7b3cf6a import org.slf4j.Logger; // CraftBukkit start -@@ -909,6 +914,16 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -905,6 +910,16 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl this.player.level().getChunkAt(blockposition).setBlockEntity(tileentity); } @@ -64,7 +64,7 @@ index 0a73b464d696b85d94b9a4a0ee155d5b395cf590..eb0316f0825ab0304b872507e7b3cf6a commandblocklistenerabstract.setCommand(s); commandblocklistenerabstract.setTrackOutput(flag); if (!flag) { -@@ -940,7 +955,18 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -936,7 +951,18 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl BaseCommandBlock commandblocklistenerabstract = packet.getCommandBlock(this.player.level()); if (commandblocklistenerabstract != null) { diff --git a/patches/server/0041-Add-depth-limit-to-SNBT.patch b/patches/server/0040-Add-depth-limit-to-SNBT.patch similarity index 97% rename from patches/server/0041-Add-depth-limit-to-SNBT.patch rename to patches/server/0040-Add-depth-limit-to-SNBT.patch index 0734a78..7f463a7 100644 --- a/patches/server/0041-Add-depth-limit-to-SNBT.patch +++ b/patches/server/0040-Add-depth-limit-to-SNBT.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add depth limit to SNBT diff --git a/src/main/java/net/minecraft/nbt/TagParser.java b/src/main/java/net/minecraft/nbt/TagParser.java -index 9ecd0b7ddaa8376f3c1448f810f7757c9ba1b90a..817f7f8400122da9881adcf530f379bfb69910d8 100644 +index 94cb73e7f60171aa57bd1dbe7e91ef4db94e70b7..9ed1c477620b41317c4bf2b14ebc672c2fdd4656 100644 --- a/src/main/java/net/minecraft/nbt/TagParser.java +++ b/src/main/java/net/minecraft/nbt/TagParser.java @@ -182,9 +182,56 @@ public class TagParser { diff --git a/patches/server/0042-Limit-beacon-effectRange.patch b/patches/server/0041-Limit-beacon-effectRange.patch similarity index 93% rename from patches/server/0042-Limit-beacon-effectRange.patch rename to patches/server/0041-Limit-beacon-effectRange.patch index 110b67c..9d85c01 100644 --- a/patches/server/0042-Limit-beacon-effectRange.patch +++ b/patches/server/0041-Limit-beacon-effectRange.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Limit beacon effectRange diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java -index bfcf9e0c342f255d285b1ef7f88d71efed653ecd..8ebee182002a360a7438938a97834f25da2695fb 100644 +index 4b81b0180dfc96fc6a88646838a886ca5b5d301b..63ea77b3e965ff18571492d511ef7c1082441f9d 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java @@ -87,7 +87,7 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name diff --git a/patches/server/0043-Improve-validation-of-ResourceLocations.patch b/patches/server/0042-Improve-validation-of-ResourceLocations.patch similarity index 100% rename from patches/server/0043-Improve-validation-of-ResourceLocations.patch rename to patches/server/0042-Improve-validation-of-ResourceLocations.patch diff --git a/patches/server/0044-Don-t-log-on-too-many-chained-updates.patch b/patches/server/0043-Don-t-log-on-too-many-chained-updates.patch similarity index 90% rename from patches/server/0044-Don-t-log-on-too-many-chained-updates.patch rename to patches/server/0043-Don-t-log-on-too-many-chained-updates.patch index 81dec2f..3c4c3c8 100644 --- a/patches/server/0044-Don-t-log-on-too-many-chained-updates.patch +++ b/patches/server/0043-Don-t-log-on-too-many-chained-updates.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Don't log on too many chained updates diff --git a/src/main/java/net/minecraft/world/level/redstone/CollectingNeighborUpdater.java b/src/main/java/net/minecraft/world/level/redstone/CollectingNeighborUpdater.java -index 395bb163fb1d62dd2e6949e1146c337c0bbc626f..a40f014c4065fd6f7b27483ccc659bd31d5b7235 100644 +index 87db9febbbf53702be0e1e89a95db99e823713e5..02160e69f4b6bee344943307ec7ddcb7c1489162 100644 --- a/src/main/java/net/minecraft/world/level/redstone/CollectingNeighborUpdater.java +++ b/src/main/java/net/minecraft/world/level/redstone/CollectingNeighborUpdater.java @@ -56,7 +56,7 @@ public class CollectingNeighborUpdater implements NeighborUpdater { diff --git a/patches/server/0045-Fix-packet-related-lag-exploits.patch b/patches/server/0044-Fix-packet-related-lag-exploits.patch similarity index 89% rename from patches/server/0045-Fix-packet-related-lag-exploits.patch rename to patches/server/0044-Fix-packet-related-lag-exploits.patch index 02602fe..9ec680c 100644 --- a/patches/server/0045-Fix-packet-related-lag-exploits.patch +++ b/patches/server/0044-Fix-packet-related-lag-exploits.patch @@ -5,10 +5,10 @@ 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 eb0316f0825ab0304b872507e7b3cf6a4ef86ae1..63dddf503ed035f9c49d9f008c40373acbc16c1a 100644 +index b69f7c74fe4e2ec6280ebee27f8b8fd0ec8ac361..1350b224b7321fe1aac3d3cf5ff1f7a089da53cc 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -874,7 +874,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -870,7 +870,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl this.player.sendSystemMessage(Component.translatable("advMode.notEnabled")); } else if (!this.player.canUseGameMasterBlocks() && (!this.player.isCreative() || !this.player.getBukkitEntity().hasPermission("minecraft.commandblock"))) { // Paper - command block permission this.player.sendSystemMessage(Component.translatable("advMode.notAllowed")); @@ -17,7 +17,7 @@ index eb0316f0825ab0304b872507e7b3cf6a4ef86ae1..63dddf503ed035f9c49d9f008c40373a BaseCommandBlock commandblocklistenerabstract = null; CommandBlockEntity tileentitycommand = null; BlockPos blockposition = packet.getPos(); -@@ -1043,7 +1043,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -1039,7 +1039,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl @Override public void handleSetStructureBlock(ServerboundSetStructureBlockPacket packet) { PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel()); @@ -26,7 +26,7 @@ index eb0316f0825ab0304b872507e7b3cf6a4ef86ae1..63dddf503ed035f9c49d9f008c40373a BlockPos blockposition = packet.getPos(); BlockState iblockdata = this.player.level().getBlockState(blockposition); BlockEntity tileentity = this.player.level().getBlockEntity(blockposition); -@@ -1101,7 +1101,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -1097,7 +1097,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl @Override public void handleSetJigsawBlock(ServerboundSetJigsawBlockPacket packet) { PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel()); @@ -35,7 +35,7 @@ index eb0316f0825ab0304b872507e7b3cf6a4ef86ae1..63dddf503ed035f9c49d9f008c40373a BlockPos blockposition = packet.getPos(); BlockState iblockdata = this.player.level().getBlockState(blockposition); BlockEntity tileentity = this.player.level().getBlockEntity(blockposition); -@@ -1126,7 +1126,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -1122,7 +1122,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl @Override public void handleJigsawGenerate(ServerboundJigsawGeneratePacket packet) { PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel()); diff --git a/patches/server/0046-Limit-save-data-for-Bees-and-Vexes.patch b/patches/server/0045-Limit-save-data-for-Bees-and-Vexes.patch similarity index 96% rename from patches/server/0046-Limit-save-data-for-Bees-and-Vexes.patch rename to patches/server/0045-Limit-save-data-for-Bees-and-Vexes.patch index 5a57085..1058b79 100644 --- a/patches/server/0046-Limit-save-data-for-Bees-and-Vexes.patch +++ b/patches/server/0045-Limit-save-data-for-Bees-and-Vexes.patch @@ -24,7 +24,7 @@ index f9521a6e115f0c975a7885b024c99eae300b63bf..c1598d0caee40a7d73af549b31b61ee7 this.savedFlowerPos = null; diff --git a/src/main/java/net/minecraft/world/entity/monster/Vex.java b/src/main/java/net/minecraft/world/entity/monster/Vex.java -index 30ea3f64234fd1fda8dada3c7fb12be0730322a8..b621b9a50047c5283b259d67019989ec823576e0 100644 +index f443006c1e32feee97b32312814e2447a50c45e2..ad418449f5ffd4bcceb5834b1385dc69259f3a21 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Vex.java +++ b/src/main/java/net/minecraft/world/entity/monster/Vex.java @@ -118,8 +118,12 @@ public class Vex extends Monster implements TraceableEntity { diff --git a/patches/server/0047-Mute-invalid-attributes.patch b/patches/server/0046-Mute-invalid-attributes.patch similarity index 100% rename from patches/server/0047-Mute-invalid-attributes.patch rename to patches/server/0046-Mute-invalid-attributes.patch diff --git a/patches/server/0048-Mute-invalid-Enderdragon-phases.patch b/patches/server/0047-Mute-invalid-Enderdragon-phases.patch similarity index 100% rename from patches/server/0048-Mute-invalid-Enderdragon-phases.patch rename to patches/server/0047-Mute-invalid-Enderdragon-phases.patch diff --git a/patches/server/0049-Add-length-limit-to-note-block-sound.patch b/patches/server/0048-Add-length-limit-to-note-block-sound.patch similarity index 100% rename from patches/server/0049-Add-length-limit-to-note-block-sound.patch rename to patches/server/0048-Add-length-limit-to-note-block-sound.patch diff --git a/patches/server/0050-Change-version-fetcher-to-AMG.patch b/patches/server/0049-Change-version-fetcher-to-AMG.patch similarity index 100% rename from patches/server/0050-Change-version-fetcher-to-AMG.patch rename to patches/server/0049-Change-version-fetcher-to-AMG.patch diff --git a/patches/server/0051-Add-depth-limit-to-Component-deserialization.patch b/patches/server/0050-Add-depth-limit-to-Component-deserialization.patch similarity index 100% rename from patches/server/0051-Add-depth-limit-to-Component-deserialization.patch rename to patches/server/0050-Add-depth-limit-to-Component-deserialization.patch diff --git a/patches/server/0052-Add-depth-limit-to-updateCustomBlockEntityTag.patch b/patches/server/0051-Add-depth-limit-to-updateCustomBlockEntityTag.patch similarity index 100% rename from patches/server/0052-Add-depth-limit-to-updateCustomBlockEntityTag.patch rename to patches/server/0051-Add-depth-limit-to-updateCustomBlockEntityTag.patch