From 006bae22aec23ca9c0bcece2868528bdc0202c46 Mon Sep 17 00:00:00 2001 From: Allink Date: Sat, 17 Jun 2023 00:35:19 +0100 Subject: [PATCH] Merge Video's resource location patches --- ...n-more-resource-location-validation.patch} | 50 +++++++++++++++-- ... 0013-Change-version-fetcher-to-AMG.patch} | 2 +- ...en-more-resource-location-validation.patch | 54 ------------------- ...s-with-invalid-namespaces-from-bein.patch} | 0 ...UIDs-during-the-CompoundTag-GamePro.patch} | 0 ...ry-player-data-in-the-nbt-component.patch} | 0 ...017-Limit-ListTags-to-1024-elements.patch} | 2 +- ...lling-potion-effects-and-certain-po.patch} | 2 +- ...ch => 0019-Fix-negative-death-times.patch} | 2 +- ...Add-custom-classes-used-by-Scissors.patch} | 0 ...tes-before-attempting-to-get-block-.patch} | 0 ...tags.patch => 0022-Reset-large-tags.patch} | 2 +- ...Account-for-items-inside-containers.patch} | 4 +- ...ehicle-collision-checks-to-3-and-di.patch} | 0 ...handling-of-invalid-JSON-components.patch} | 2 +- ...-oversized-components-from-updating.patch} | 0 ...ch => 0027-Add-MasterBlockFireEvent.patch} | 0 ...-Don-t-log-invalid-teams-to-console.patch} | 2 +- ...=> 0029-Block-server-side-chunkbans.patch} | 0 ...> 0030-Add-spectator-teleport-event.patch} | 0 ...31-Prevent-invalid-container-events.patch} | 0 ...te-block-entity-tag-query-positions.patch} | 2 +- ...-legacy-messages-over-1k-characters.patch} | 0 ...-bounds-HangingEntity-crash-exploit.patch} | 0 ...tch => 0035-Prevent-velocity-freeze.patch} | 2 +- ...Scissors-configuration-file-command.patch} | 0 ...ch-invalid-entity-rotation-log-spam.patch} | 2 +- ...Patch-large-selector-distance-crash.patch} | 0 ...mit-sculk-catalyst-cursor-positions.patch} | 0 ...patch => 0040-Limit-map-decorations.patch} | 0 ...layer-banning-using-duplicate-UUIDs.patch} | 0 ...on-t-warn-on-duplicate-entity-UUIDs.patch} | 0 ...ayers-from-nbt-components-configura.patch} | 0 ...component-extra-empty-array-exploit.patch} | 0 ...pth-limit-to-Component-deserializer.patch} | 0 ...tch => 0046-Add-depth-limit-to-SNBT.patch} | 0 ...0047-Implement-command-block-events.patch} | 0 ...ch => 0048-Limit-beacon-effectRange.patch} | 0 ...0049-Fix-invalid-armor-trim-exploit.patch} | 0 ...ove-validation-of-ResourceLocations.patch} | 0 40 files changed, 59 insertions(+), 69 deletions(-) rename patches/server/{0011-Even-more-ResourceLocation-validation-and-log-spam-f.patch => 0011-Even-more-resource-location-validation.patch} (61%) rename patches/server/{0014-Change-version-fetcher-to-AMG.patch => 0013-Change-version-fetcher-to-AMG.patch} (98%) delete mode 100644 patches/server/0013-Even-more-resource-location-validation.patch rename patches/server/{0015-Prevent-attributes-with-invalid-namespaces-from-bein.patch => 0014-Prevent-attributes-with-invalid-namespaces-from-bein.patch} (100%) rename patches/server/{0016-Validate-String-UUIDs-during-the-CompoundTag-GamePro.patch => 0015-Validate-String-UUIDs-during-the-CompoundTag-GamePro.patch} (100%) rename patches/server/{0017-Don-t-query-player-data-in-the-nbt-component.patch => 0016-Don-t-query-player-data-in-the-nbt-component.patch} (100%) rename patches/server/{0018-Limit-ListTags-to-1024-elements.patch => 0017-Limit-ListTags-to-1024-elements.patch} (88%) rename patches/server/{0019-Fixes-creative-killing-potion-effects-and-certain-po.patch => 0018-Fixes-creative-killing-potion-effects-and-certain-po.patch} (96%) rename patches/server/{0020-Fix-negative-death-times.patch => 0019-Fix-negative-death-times.patch} (90%) rename patches/server/{0021-Add-custom-classes-used-by-Scissors.patch => 0020-Add-custom-classes-used-by-Scissors.patch} (100%) rename patches/server/{0022-Validate-coordinates-before-attempting-to-get-block-.patch => 0021-Validate-coordinates-before-attempting-to-get-block-.patch} (100%) rename patches/server/{0023-Reset-large-tags.patch => 0022-Reset-large-tags.patch} (95%) rename patches/server/{0024-Account-for-items-inside-containers.patch => 0023-Account-for-items-inside-containers.patch} (98%) rename patches/server/{0025-Limit-amount-of-vehicle-collision-checks-to-3-and-di.patch => 0024-Limit-amount-of-vehicle-collision-checks-to-3-and-di.patch} (100%) rename patches/server/{0026-Better-handling-of-invalid-JSON-components.patch => 0025-Better-handling-of-invalid-JSON-components.patch} (99%) rename patches/server/{0027-Reject-oversized-components-from-updating.patch => 0026-Reject-oversized-components-from-updating.patch} (100%) rename patches/server/{0028-Add-MasterBlockFireEvent.patch => 0027-Add-MasterBlockFireEvent.patch} (100%) rename patches/server/{0029-Don-t-log-invalid-teams-to-console.patch => 0028-Don-t-log-invalid-teams-to-console.patch} (92%) rename patches/server/{0030-Block-server-side-chunkbans.patch => 0029-Block-server-side-chunkbans.patch} (100%) rename patches/server/{0031-Add-spectator-teleport-event.patch => 0030-Add-spectator-teleport-event.patch} (100%) rename patches/server/{0032-Prevent-invalid-container-events.patch => 0031-Prevent-invalid-container-events.patch} (100%) rename patches/server/{0033-Validate-block-entity-tag-query-positions.patch => 0032-Validate-block-entity-tag-query-positions.patch} (92%) rename patches/server/{0034-Refuse-to-convert-legacy-messages-over-1k-characters.patch => 0033-Refuse-to-convert-legacy-messages-over-1k-characters.patch} (100%) rename patches/server/{0035-Fixes-out-of-bounds-HangingEntity-crash-exploit.patch => 0034-Fixes-out-of-bounds-HangingEntity-crash-exploit.patch} (100%) rename patches/server/{0036-Prevent-velocity-freeze.patch => 0035-Prevent-velocity-freeze.patch} (97%) rename patches/server/{0037-Add-Scissors-configuration-file-command.patch => 0036-Add-Scissors-configuration-file-command.patch} (100%) rename patches/server/{0038-Patch-invalid-entity-rotation-log-spam.patch => 0037-Patch-invalid-entity-rotation-log-spam.patch} (93%) rename patches/server/{0039-Patch-large-selector-distance-crash.patch => 0038-Patch-large-selector-distance-crash.patch} (100%) rename patches/server/{0040-Limit-sculk-catalyst-cursor-positions.patch => 0039-Limit-sculk-catalyst-cursor-positions.patch} (100%) rename patches/server/{0041-Limit-map-decorations.patch => 0040-Limit-map-decorations.patch} (100%) rename patches/server/{0042-Prevent-player-banning-using-duplicate-UUIDs.patch => 0041-Prevent-player-banning-using-duplicate-UUIDs.patch} (100%) rename patches/server/{0043-Don-t-warn-on-duplicate-entity-UUIDs.patch => 0042-Don-t-warn-on-duplicate-entity-UUIDs.patch} (100%) rename patches/server/{0044-Make-excluding-players-from-nbt-components-configura.patch => 0043-Make-excluding-players-from-nbt-components-configura.patch} (100%) rename patches/server/{0045-Fix-component-extra-empty-array-exploit.patch => 0044-Fix-component-extra-empty-array-exploit.patch} (100%) rename patches/server/{0046-Add-depth-limit-to-Component-deserializer.patch => 0045-Add-depth-limit-to-Component-deserializer.patch} (100%) rename patches/server/{0047-Add-depth-limit-to-SNBT.patch => 0046-Add-depth-limit-to-SNBT.patch} (100%) rename patches/server/{0048-Implement-command-block-events.patch => 0047-Implement-command-block-events.patch} (100%) rename patches/server/{0049-Limit-beacon-effectRange.patch => 0048-Limit-beacon-effectRange.patch} (100%) rename patches/server/{0050-Fix-invalid-armor-trim-exploit.patch => 0049-Fix-invalid-armor-trim-exploit.patch} (100%) rename patches/server/{0051-Improve-validation-of-ResourceLocations.patch => 0050-Improve-validation-of-ResourceLocations.patch} (100%) diff --git a/patches/server/0011-Even-more-ResourceLocation-validation-and-log-spam-f.patch b/patches/server/0011-Even-more-resource-location-validation.patch similarity index 61% rename from patches/server/0011-Even-more-ResourceLocation-validation-and-log-spam-f.patch rename to patches/server/0011-Even-more-resource-location-validation.patch index 59de4f8..8429aff 100644 --- a/patches/server/0011-Even-more-ResourceLocation-validation-and-log-spam-f.patch +++ b/patches/server/0011-Even-more-resource-location-validation.patch @@ -1,13 +1,22 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Video Date: Mon, 9 May 2022 23:40:59 -0500 -Subject: [PATCH] Even more ResourceLocation validation and log spam fixes +Subject: [PATCH] Even more resource location validation diff --git a/src/main/java/net/minecraft/world/entity/AreaEffectCloud.java b/src/main/java/net/minecraft/world/entity/AreaEffectCloud.java -index fa724cd34a7c469ca12068e64295cd00ad215a3c..168b60fda38a7172f4473017ccc42447b36faab2 100644 +index 91e0328f847a2464a1cf65134520244a4cec705f..77ae3bc5fd6cf34aae7bd3baa563f3e23e57de26 100644 --- a/src/main/java/net/minecraft/world/entity/AreaEffectCloud.java +++ b/src/main/java/net/minecraft/world/entity/AreaEffectCloud.java +@@ -145,7 +145,7 @@ public class AreaEffectCloud extends Entity implements TraceableEntity { + } + + public void setPotionType(String string) { +- this.setPotion(BuiltInRegistries.POTION.get(new ResourceLocation(string))); ++ this.setPotion(BuiltInRegistries.POTION.get(ResourceLocation.tryParse(string))); // Scissors - Validate resource locations + } + // CraftBukkit end + @@ -425,7 +425,7 @@ public class AreaEffectCloud extends Entity implements TraceableEntity { try { this.setParticle(ParticleArgument.readParticle(new StringReader(nbt.getString("Particle")), (HolderLookup) BuiltInRegistries.PARTICLE_TYPE.asLookup())); @@ -17,6 +26,41 @@ index fa724cd34a7c469ca12068e64295cd00ad215a3c..168b60fda38a7172f4473017ccc42447 } } +diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java +index 9afc81ccb237c3655d64cdbe8a0db9a4d7791043..ffcb77755b28bcdb3eae981fc735e6dde664bb6e 100644 +--- a/src/main/java/net/minecraft/world/entity/EntityType.java ++++ b/src/main/java/net/minecraft/world/entity/EntityType.java +@@ -588,7 +588,7 @@ public class EntityType implements FeatureElement, EntityTypeT + }), (entity) -> { + entity.load(nbt); + }, () -> { +- EntityType.LOGGER.warn("Skipping Entity with id {}", nbt.getString("id")); ++ /*EntityType.LOGGER.warn("Skipping Entity with id {}", nbt.getString("id"));*/ // Scissors - Don't log invalid entities + }); + } + +@@ -607,7 +607,7 @@ public class EntityType implements FeatureElement, EntityTypeT + } + + public static Optional> by(CompoundTag nbt) { +- return BuiltInRegistries.ENTITY_TYPE.getOptional(new ResourceLocation(nbt.getString("id"))); ++ return BuiltInRegistries.ENTITY_TYPE.getOptional(ResourceLocation.tryParse(nbt.getString("id"))); + } + + @Nullable +diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java +index e2a25c29ec74147b3e66aa0b3deb85a8f6ee53a5..b0c953ad8275740679c847e348b311de93d64965 100644 +--- a/src/main/java/net/minecraft/world/entity/Mob.java ++++ b/src/main/java/net/minecraft/world/entity/Mob.java +@@ -618,7 +618,7 @@ public abstract class Mob extends LivingEntity implements Targeting { + + this.setLeftHanded(nbt.getBoolean("LeftHanded")); + if (nbt.contains("DeathLootTable", 8)) { +- this.lootTable = new ResourceLocation(nbt.getString("DeathLootTable")); ++ this.lootTable = ResourceLocation.tryParse(nbt.getString("DeathLootTable")); + this.lootTableSeed = nbt.getLong("DeathLootTableSeed"); + } + diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftLootable.java b/src/main/java/org/bukkit/craftbukkit/block/CraftLootable.java index e49eece9bff3a53469673d03a7bbf8f9cf8776b8..a49f32e9649155b6af4b1f236e4e8142d730e7e8 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftLootable.java @@ -60,7 +104,7 @@ index 0dd0ce9a9b3253e87eda12354249ec2fd2a33cf2..b6920f9432ca1736afbe775186fbbcf1 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java -index 620d918e302a00d5a6640648e3096988d15535a0..ac6831248b7c4f25d48391432afb613f25d7e23a 100644 +index 18b9b0dc70f6872a9d71c120bcd2edca531b0ac4..fa0c023b3a88bd797f563e0e675d70966ff7dbd3 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java @@ -80,8 +80,18 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob { diff --git a/patches/server/0014-Change-version-fetcher-to-AMG.patch b/patches/server/0013-Change-version-fetcher-to-AMG.patch similarity index 98% rename from patches/server/0014-Change-version-fetcher-to-AMG.patch rename to patches/server/0013-Change-version-fetcher-to-AMG.patch index cd9a695..200654d 100644 --- a/patches/server/0014-Change-version-fetcher-to-AMG.patch +++ b/patches/server/0013-Change-version-fetcher-to-AMG.patch @@ -77,7 +77,7 @@ index 9d687da5bdf398bb3f6c84cdf1249a7213d09f2e..0a8fda6939152d393f07e5d2812409ad switch (distance) { case -1: diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index bfa091f72d6f477bcaf63d364639a1b4df9b1987..1fe26cb620e8b550790c3e110e2a1180cf0838fd 100644 +index 717e292040ed7779eb4b6c5fa26665d3df9024e7..0fb3a648ee6bd6cb88515770bcfc70e368313527 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -292,7 +292,7 @@ public class Main { diff --git a/patches/server/0013-Even-more-resource-location-validation.patch b/patches/server/0013-Even-more-resource-location-validation.patch deleted file mode 100644 index 874c66a..0000000 --- a/patches/server/0013-Even-more-resource-location-validation.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Telesphoreo -Date: Sat, 10 Dec 2022 23:02:48 -0600 -Subject: [PATCH] Even more resource location validation - - -diff --git a/src/main/java/net/minecraft/world/entity/AreaEffectCloud.java b/src/main/java/net/minecraft/world/entity/AreaEffectCloud.java -index db3cddf8b227453c9b08e481b21101c5d2e0472d..77ae3bc5fd6cf34aae7bd3baa563f3e23e57de26 100644 ---- a/src/main/java/net/minecraft/world/entity/AreaEffectCloud.java -+++ b/src/main/java/net/minecraft/world/entity/AreaEffectCloud.java -@@ -145,7 +145,7 @@ public class AreaEffectCloud extends Entity implements TraceableEntity { - } - - public void setPotionType(String string) { -- this.setPotion(BuiltInRegistries.POTION.get(new ResourceLocation(string))); -+ this.setPotion(BuiltInRegistries.POTION.get(ResourceLocation.tryParse(string))); // Scissors - Validate resource locations - } - // CraftBukkit end - -diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java -index 9afc81ccb237c3655d64cdbe8a0db9a4d7791043..ffcb77755b28bcdb3eae981fc735e6dde664bb6e 100644 ---- a/src/main/java/net/minecraft/world/entity/EntityType.java -+++ b/src/main/java/net/minecraft/world/entity/EntityType.java -@@ -588,7 +588,7 @@ public class EntityType implements FeatureElement, EntityTypeT - }), (entity) -> { - entity.load(nbt); - }, () -> { -- EntityType.LOGGER.warn("Skipping Entity with id {}", nbt.getString("id")); -+ /*EntityType.LOGGER.warn("Skipping Entity with id {}", nbt.getString("id"));*/ // Scissors - Don't log invalid entities - }); - } - -@@ -607,7 +607,7 @@ public class EntityType implements FeatureElement, EntityTypeT - } - - public static Optional> by(CompoundTag nbt) { -- return BuiltInRegistries.ENTITY_TYPE.getOptional(new ResourceLocation(nbt.getString("id"))); -+ return BuiltInRegistries.ENTITY_TYPE.getOptional(ResourceLocation.tryParse(nbt.getString("id"))); - } - - @Nullable -diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index e2a25c29ec74147b3e66aa0b3deb85a8f6ee53a5..b0c953ad8275740679c847e348b311de93d64965 100644 ---- a/src/main/java/net/minecraft/world/entity/Mob.java -+++ b/src/main/java/net/minecraft/world/entity/Mob.java -@@ -618,7 +618,7 @@ public abstract class Mob extends LivingEntity implements Targeting { - - this.setLeftHanded(nbt.getBoolean("LeftHanded")); - if (nbt.contains("DeathLootTable", 8)) { -- this.lootTable = new ResourceLocation(nbt.getString("DeathLootTable")); -+ this.lootTable = ResourceLocation.tryParse(nbt.getString("DeathLootTable")); - this.lootTableSeed = nbt.getLong("DeathLootTableSeed"); - } - 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 100% 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 diff --git a/patches/server/0016-Validate-String-UUIDs-during-the-CompoundTag-GamePro.patch b/patches/server/0015-Validate-String-UUIDs-during-the-CompoundTag-GamePro.patch similarity index 100% rename from patches/server/0016-Validate-String-UUIDs-during-the-CompoundTag-GamePro.patch rename to patches/server/0015-Validate-String-UUIDs-during-the-CompoundTag-GamePro.patch diff --git a/patches/server/0017-Don-t-query-player-data-in-the-nbt-component.patch b/patches/server/0016-Don-t-query-player-data-in-the-nbt-component.patch similarity index 100% rename from patches/server/0017-Don-t-query-player-data-in-the-nbt-component.patch rename to patches/server/0016-Don-t-query-player-data-in-the-nbt-component.patch diff --git a/patches/server/0018-Limit-ListTags-to-1024-elements.patch b/patches/server/0017-Limit-ListTags-to-1024-elements.patch similarity index 88% rename from patches/server/0018-Limit-ListTags-to-1024-elements.patch rename to patches/server/0017-Limit-ListTags-to-1024-elements.patch index 72bb3e3..d8e90b7 100644 --- a/patches/server/0018-Limit-ListTags-to-1024-elements.patch +++ b/patches/server/0017-Limit-ListTags-to-1024-elements.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Limit ListTags to 1024 elements diff --git a/src/main/java/net/minecraft/nbt/ListTag.java b/src/main/java/net/minecraft/nbt/ListTag.java -index 749d3e67a877d7d1ed47b5fef511a604ee6589b6..fe7a7fd77c7dd1750144fb57e181c51ccda26329 100644 +index b74b77ec2fd45c7a44e4f2696c4f57075c3d4080..c6ac2aff889ff157da47ee26fbfc1f83616d5b8f 100644 --- a/src/main/java/net/minecraft/nbt/ListTag.java +++ b/src/main/java/net/minecraft/nbt/ListTag.java @@ -31,6 +31,7 @@ public class ListTag extends CollectionTag { diff --git a/patches/server/0019-Fixes-creative-killing-potion-effects-and-certain-po.patch b/patches/server/0018-Fixes-creative-killing-potion-effects-and-certain-po.patch similarity index 96% rename from patches/server/0019-Fixes-creative-killing-potion-effects-and-certain-po.patch rename to patches/server/0018-Fixes-creative-killing-potion-effects-and-certain-po.patch index 4ee2dbe..0b2a2a2 100644 --- a/patches/server/0019-Fixes-creative-killing-potion-effects-and-certain-po.patch +++ b/patches/server/0018-Fixes-creative-killing-potion-effects-and-certain-po.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fixes creative-killing potion effects and certain potion diff --git a/src/main/java/net/minecraft/world/effect/MobEffect.java b/src/main/java/net/minecraft/world/effect/MobEffect.java -index 2cc714585fc3790b70a7ad1ab8034543462e2b3b..2d3706d8d0dbed3b3588066eaa6b9ce1b266294f 100644 +index bcce17f884b57e619749351b7b2047f0a5f9be71..65e245e02676077e481f8a1fcd9885c389f9666c 100644 --- a/src/main/java/net/minecraft/world/effect/MobEffect.java +++ b/src/main/java/net/minecraft/world/effect/MobEffect.java @@ -58,6 +58,7 @@ public class MobEffect { diff --git a/patches/server/0020-Fix-negative-death-times.patch b/patches/server/0019-Fix-negative-death-times.patch similarity index 90% rename from patches/server/0020-Fix-negative-death-times.patch rename to patches/server/0019-Fix-negative-death-times.patch index dfdcc3a..d7b36c4 100644 --- a/patches/server/0020-Fix-negative-death-times.patch +++ b/patches/server/0019-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 67627bbf84f5aab2872f636b1dcb6728c8494147..468f64afb7e9b3ef579205d3beea025deb31b460 100644 +index a189461330a4d427a7450d504ef13de3605497e3..79430aef1cbcad7d872435ebdec60321e2573bb3 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -630,7 +630,7 @@ public abstract class LivingEntity extends Entity implements Attackable { 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-Validate-coordinates-before-attempting-to-get-block-.patch b/patches/server/0021-Validate-coordinates-before-attempting-to-get-block-.patch similarity index 100% rename from patches/server/0022-Validate-coordinates-before-attempting-to-get-block-.patch rename to patches/server/0021-Validate-coordinates-before-attempting-to-get-block-.patch diff --git a/patches/server/0023-Reset-large-tags.patch b/patches/server/0022-Reset-large-tags.patch similarity index 95% rename from patches/server/0023-Reset-large-tags.patch rename to patches/server/0022-Reset-large-tags.patch index da6f151..e6f3e63 100644 --- a/patches/server/0023-Reset-large-tags.patch +++ b/patches/server/0022-Reset-large-tags.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Reset large tags diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index b367ec1feaccbd67e9e28c0d0515e163f37135fe..d1547b9ba36baec925751b9bb0498c8a8cac12f8 100644 +index adb7220be617d6d9f2cdd7fbe4fa2dd24cc7d142..aabde31cd4c6a4f58855156272bc451b042cc315 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java @@ -21,6 +21,7 @@ import java.util.function.Predicate; diff --git a/patches/server/0024-Account-for-items-inside-containers.patch b/patches/server/0023-Account-for-items-inside-containers.patch similarity index 98% rename from patches/server/0024-Account-for-items-inside-containers.patch rename to patches/server/0023-Account-for-items-inside-containers.patch index fcd5ed0..7e8aab7 100644 --- a/patches/server/0024-Account-for-items-inside-containers.patch +++ b/patches/server/0023-Account-for-items-inside-containers.patch @@ -59,7 +59,7 @@ index 4092c7a8c2b0d9d26e6f4d97386735236300d132..9e0ab51dd7a4f9fed8f9edde962d42d4 } } 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 2a786c9fd29dc2139cf487fa645cd43345d60167..dbdc66620ae4284cfe96f633b1f4db46866b597b 100644 +index 448fa4f4f200430d6ce3051763c7ceb697696146..430810b9cc554dfb3bb0972c103c8a36e8db67ef 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; @@ -201,7 +201,7 @@ index 881379681c39230a00b3a1f11cd87498984396c7..1be5d600573f7632e6630224530dd765 } diff --git a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java -index 789e5458f4a137694563a22612455506807de51b..84c721da46b7786857677b56f439c2b9448ba4b8 100644 +index a8a26a0a37a08b6bbeb5a1fde417d6f448d3c79f..2502c38640fa39552efc02b59733bd0d7330e13a 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java @@ -6,6 +6,7 @@ import java.util.function.BooleanSupplier; diff --git a/patches/server/0025-Limit-amount-of-vehicle-collision-checks-to-3-and-di.patch b/patches/server/0024-Limit-amount-of-vehicle-collision-checks-to-3-and-di.patch similarity index 100% rename from patches/server/0025-Limit-amount-of-vehicle-collision-checks-to-3-and-di.patch rename to patches/server/0024-Limit-amount-of-vehicle-collision-checks-to-3-and-di.patch diff --git a/patches/server/0026-Better-handling-of-invalid-JSON-components.patch b/patches/server/0025-Better-handling-of-invalid-JSON-components.patch similarity index 99% rename from patches/server/0026-Better-handling-of-invalid-JSON-components.patch rename to patches/server/0025-Better-handling-of-invalid-JSON-components.patch index 02dfd6e..4b98e76 100644 --- a/patches/server/0026-Better-handling-of-invalid-JSON-components.patch +++ b/patches/server/0025-Better-handling-of-invalid-JSON-components.patch @@ -110,7 +110,7 @@ index 97a2657bc98d41c3c1e376b266d2c85f685acc88..7b6476455e095eed15c92797ce3a3e11 } }).reduce((accumulator, current) -> { diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 92202262eff01ae3bbeff0e6ebdcf26ad613c169..38c027c0fbddf58136b7d67eb7156403a79de4d1 100644 +index b38c4cbcf0405d82c7b6e018e80a3174e460c1a4..bcd9565c8e09b44ca4cac372bea1b1e9ec343871 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2473,12 +2473,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0027-Reject-oversized-components-from-updating.patch b/patches/server/0026-Reject-oversized-components-from-updating.patch similarity index 100% rename from patches/server/0027-Reject-oversized-components-from-updating.patch rename to patches/server/0026-Reject-oversized-components-from-updating.patch diff --git a/patches/server/0028-Add-MasterBlockFireEvent.patch b/patches/server/0027-Add-MasterBlockFireEvent.patch similarity index 100% rename from patches/server/0028-Add-MasterBlockFireEvent.patch rename to patches/server/0027-Add-MasterBlockFireEvent.patch diff --git a/patches/server/0029-Don-t-log-invalid-teams-to-console.patch b/patches/server/0028-Don-t-log-invalid-teams-to-console.patch similarity index 92% rename from patches/server/0029-Don-t-log-invalid-teams-to-console.patch rename to patches/server/0028-Don-t-log-invalid-teams-to-console.patch index 7d908ad..73687fb 100644 --- a/patches/server/0029-Don-t-log-invalid-teams-to-console.patch +++ b/patches/server/0028-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 468f64afb7e9b3ef579205d3beea025deb31b460..71a32f8dfdf043f55f092225a13884ae8935e67c 100644 +index 79430aef1cbcad7d872435ebdec60321e2573bb3..ee1744ca00fe14b052b9d164d2bbe9dc93201bde 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -862,7 +862,9 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0030-Block-server-side-chunkbans.patch b/patches/server/0029-Block-server-side-chunkbans.patch similarity index 100% rename from patches/server/0030-Block-server-side-chunkbans.patch rename to patches/server/0029-Block-server-side-chunkbans.patch diff --git a/patches/server/0031-Add-spectator-teleport-event.patch b/patches/server/0030-Add-spectator-teleport-event.patch similarity index 100% rename from patches/server/0031-Add-spectator-teleport-event.patch rename to patches/server/0030-Add-spectator-teleport-event.patch diff --git a/patches/server/0032-Prevent-invalid-container-events.patch b/patches/server/0031-Prevent-invalid-container-events.patch similarity index 100% rename from patches/server/0032-Prevent-invalid-container-events.patch rename to patches/server/0031-Prevent-invalid-container-events.patch diff --git a/patches/server/0033-Validate-block-entity-tag-query-positions.patch b/patches/server/0032-Validate-block-entity-tag-query-positions.patch similarity index 92% rename from patches/server/0033-Validate-block-entity-tag-query-positions.patch rename to patches/server/0032-Validate-block-entity-tag-query-positions.patch index b357139..5b52834 100644 --- a/patches/server/0033-Validate-block-entity-tag-query-positions.patch +++ b/patches/server/0032-Validate-block-entity-tag-query-positions.patch @@ -5,7 +5,7 @@ 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 37fcbdcddaa6cbfd6ae37d70cffab957c90f4e07..01f88bf2f4872884a9c4c2d1d5f1369c61fb0ebf 100644 +index afc17ec86d12cefc30c2aabd86a04131f7dffdb6..27c48014605d34d9716ea3029ac84b2eb4907a4e 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1375,7 +1375,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0034-Refuse-to-convert-legacy-messages-over-1k-characters.patch b/patches/server/0033-Refuse-to-convert-legacy-messages-over-1k-characters.patch similarity index 100% rename from patches/server/0034-Refuse-to-convert-legacy-messages-over-1k-characters.patch rename to patches/server/0033-Refuse-to-convert-legacy-messages-over-1k-characters.patch diff --git a/patches/server/0035-Fixes-out-of-bounds-HangingEntity-crash-exploit.patch b/patches/server/0034-Fixes-out-of-bounds-HangingEntity-crash-exploit.patch similarity index 100% rename from patches/server/0035-Fixes-out-of-bounds-HangingEntity-crash-exploit.patch rename to patches/server/0034-Fixes-out-of-bounds-HangingEntity-crash-exploit.patch diff --git a/patches/server/0036-Prevent-velocity-freeze.patch b/patches/server/0035-Prevent-velocity-freeze.patch similarity index 97% rename from patches/server/0036-Prevent-velocity-freeze.patch rename to patches/server/0035-Prevent-velocity-freeze.patch index 5c807b4..3c05314 100644 --- a/patches/server/0036-Prevent-velocity-freeze.patch +++ b/patches/server/0035-Prevent-velocity-freeze.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent velocity freeze diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractHurtingProjectile.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractHurtingProjectile.java -index 2096e8a0bdbcfc865f175f3a01ab688542481531..15d375221c253dc4ca1b598eb80b4638eba6f8d0 100644 +index 6c9a8f062f989db022154155e8a05b334a0510da..68c80eab60680c647094b4465ee1377c9e13d5ff 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractHurtingProjectile.java +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractHurtingProjectile.java @@ -1,5 +1,6 @@ diff --git a/patches/server/0037-Add-Scissors-configuration-file-command.patch b/patches/server/0036-Add-Scissors-configuration-file-command.patch similarity index 100% rename from patches/server/0037-Add-Scissors-configuration-file-command.patch rename to patches/server/0036-Add-Scissors-configuration-file-command.patch diff --git a/patches/server/0038-Patch-invalid-entity-rotation-log-spam.patch b/patches/server/0037-Patch-invalid-entity-rotation-log-spam.patch similarity index 93% rename from patches/server/0038-Patch-invalid-entity-rotation-log-spam.patch rename to patches/server/0037-Patch-invalid-entity-rotation-log-spam.patch index b284815..919692d 100644 --- a/patches/server/0038-Patch-invalid-entity-rotation-log-spam.patch +++ b/patches/server/0037-Patch-invalid-entity-rotation-log-spam.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Patch invalid entity rotation log spam diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 38c027c0fbddf58136b7d67eb7156403a79de4d1..ff3940a0d552140cae820fbed16bfb5e69507822 100644 +index bcd9565c8e09b44ca4cac372bea1b1e9ec343871..71e64ecf217b77371b5be32f93c66be042f124f2 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -4615,7 +4615,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0039-Patch-large-selector-distance-crash.patch b/patches/server/0038-Patch-large-selector-distance-crash.patch similarity index 100% rename from patches/server/0039-Patch-large-selector-distance-crash.patch rename to patches/server/0038-Patch-large-selector-distance-crash.patch diff --git a/patches/server/0040-Limit-sculk-catalyst-cursor-positions.patch b/patches/server/0039-Limit-sculk-catalyst-cursor-positions.patch similarity index 100% rename from patches/server/0040-Limit-sculk-catalyst-cursor-positions.patch rename to patches/server/0039-Limit-sculk-catalyst-cursor-positions.patch diff --git a/patches/server/0041-Limit-map-decorations.patch b/patches/server/0040-Limit-map-decorations.patch similarity index 100% rename from patches/server/0041-Limit-map-decorations.patch rename to patches/server/0040-Limit-map-decorations.patch diff --git a/patches/server/0042-Prevent-player-banning-using-duplicate-UUIDs.patch b/patches/server/0041-Prevent-player-banning-using-duplicate-UUIDs.patch similarity index 100% rename from patches/server/0042-Prevent-player-banning-using-duplicate-UUIDs.patch rename to patches/server/0041-Prevent-player-banning-using-duplicate-UUIDs.patch diff --git a/patches/server/0043-Don-t-warn-on-duplicate-entity-UUIDs.patch b/patches/server/0042-Don-t-warn-on-duplicate-entity-UUIDs.patch similarity index 100% rename from patches/server/0043-Don-t-warn-on-duplicate-entity-UUIDs.patch rename to patches/server/0042-Don-t-warn-on-duplicate-entity-UUIDs.patch diff --git a/patches/server/0044-Make-excluding-players-from-nbt-components-configura.patch b/patches/server/0043-Make-excluding-players-from-nbt-components-configura.patch similarity index 100% rename from patches/server/0044-Make-excluding-players-from-nbt-components-configura.patch rename to patches/server/0043-Make-excluding-players-from-nbt-components-configura.patch diff --git a/patches/server/0045-Fix-component-extra-empty-array-exploit.patch b/patches/server/0044-Fix-component-extra-empty-array-exploit.patch similarity index 100% rename from patches/server/0045-Fix-component-extra-empty-array-exploit.patch rename to patches/server/0044-Fix-component-extra-empty-array-exploit.patch diff --git a/patches/server/0046-Add-depth-limit-to-Component-deserializer.patch b/patches/server/0045-Add-depth-limit-to-Component-deserializer.patch similarity index 100% rename from patches/server/0046-Add-depth-limit-to-Component-deserializer.patch rename to patches/server/0045-Add-depth-limit-to-Component-deserializer.patch diff --git a/patches/server/0047-Add-depth-limit-to-SNBT.patch b/patches/server/0046-Add-depth-limit-to-SNBT.patch similarity index 100% rename from patches/server/0047-Add-depth-limit-to-SNBT.patch rename to patches/server/0046-Add-depth-limit-to-SNBT.patch diff --git a/patches/server/0048-Implement-command-block-events.patch b/patches/server/0047-Implement-command-block-events.patch similarity index 100% rename from patches/server/0048-Implement-command-block-events.patch rename to patches/server/0047-Implement-command-block-events.patch diff --git a/patches/server/0049-Limit-beacon-effectRange.patch b/patches/server/0048-Limit-beacon-effectRange.patch similarity index 100% rename from patches/server/0049-Limit-beacon-effectRange.patch rename to patches/server/0048-Limit-beacon-effectRange.patch diff --git a/patches/server/0050-Fix-invalid-armor-trim-exploit.patch b/patches/server/0049-Fix-invalid-armor-trim-exploit.patch similarity index 100% rename from patches/server/0050-Fix-invalid-armor-trim-exploit.patch rename to patches/server/0049-Fix-invalid-armor-trim-exploit.patch diff --git a/patches/server/0051-Improve-validation-of-ResourceLocations.patch b/patches/server/0050-Improve-validation-of-ResourceLocations.patch similarity index 100% rename from patches/server/0051-Improve-validation-of-ResourceLocations.patch rename to patches/server/0050-Improve-validation-of-ResourceLocations.patch