diff --git a/build-data/dev-imports.txt b/build-data/dev-imports.txt index 5f9e22a..cdd92ef 100644 --- a/build-data/dev-imports.txt +++ b/build-data/dev-imports.txt @@ -13,4 +13,5 @@ #minecraft net/minecraft/world/ContainerHelper #minecraft net/minecraft/network/chat/contents/NbtContents #minecraft net/minecraft/network/chat/ComponentUtils -#minecraft net/minecraft/network/chat/contents/EntityDataSource \ No newline at end of file +#minecraft net/minecraft/network/chat/contents/EntityDataSource +minecraft net/minecraft/network/chat/HoverEvent \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index a5f3c52..6ff162e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +1,8 @@ group=me.totalfreedom.scissors -version=1.20.1-R0.1-SNAPSHOT +version=1.20.2-R0.1-SNAPSHOT -mcVersion=1.20.1 -paperRef=773dd724469bae89d0c2075edc3d1ddc8d5b0b18 +mcVersion=1.20.2 +paperRef=5cbce366b28af1ace0b61db5afbe7dcebab7a6b0 org.gradle.caching=true org.gradle.parallel=true diff --git a/patches/server/0003-ResourceLocation-validation.patch b/patches/removed/server/0003-ResourceLocation-validation.patch similarity index 100% rename from patches/server/0003-ResourceLocation-validation.patch rename to patches/removed/server/0003-ResourceLocation-validation.patch diff --git a/patches/server/0004-Fixes-the-Blank-SkullOwner-exploit.patch b/patches/removed/server/0004-Fixes-the-Blank-SkullOwner-exploit.patch similarity index 100% rename from patches/server/0004-Fixes-the-Blank-SkullOwner-exploit.patch rename to patches/removed/server/0004-Fixes-the-Blank-SkullOwner-exploit.patch diff --git a/patches/server/0005-Fixes-log-spam-caused-by-invalid-entities-in-beehive.patch b/patches/removed/server/0005-Fixes-log-spam-caused-by-invalid-entities-in-beehive.patch similarity index 100% rename from patches/server/0005-Fixes-log-spam-caused-by-invalid-entities-in-beehive.patch rename to patches/removed/server/0005-Fixes-log-spam-caused-by-invalid-entities-in-beehive.patch diff --git a/patches/server/0006-Removes-useless-spammy-error-logging.patch b/patches/removed/server/0006-Removes-useless-spammy-error-logging.patch similarity index 100% rename from patches/server/0006-Removes-useless-spammy-error-logging.patch rename to patches/removed/server/0006-Removes-useless-spammy-error-logging.patch diff --git a/patches/server/0007-Ignore-errors-thrown-when-trying-to-remove-minecart-.patch b/patches/removed/server/0007-Ignore-errors-thrown-when-trying-to-remove-minecart-.patch similarity index 100% rename from patches/server/0007-Ignore-errors-thrown-when-trying-to-remove-minecart-.patch rename to patches/removed/server/0007-Ignore-errors-thrown-when-trying-to-remove-minecart-.patch diff --git a/patches/server/0008-ItemEntity-Check-if-items-are-air-before-calling-set.patch b/patches/removed/server/0008-ItemEntity-Check-if-items-are-air-before-calling-set.patch similarity index 100% rename from patches/server/0008-ItemEntity-Check-if-items-are-air-before-calling-set.patch rename to patches/removed/server/0008-ItemEntity-Check-if-items-are-air-before-calling-set.patch diff --git a/patches/server/0009-Fixes-Knowledge-Books-causing-log-spam-when-invalid-.patch b/patches/removed/server/0009-Fixes-Knowledge-Books-causing-log-spam-when-invalid-.patch similarity index 100% rename from patches/server/0009-Fixes-Knowledge-Books-causing-log-spam-when-invalid-.patch rename to patches/removed/server/0009-Fixes-Knowledge-Books-causing-log-spam-when-invalid-.patch diff --git a/patches/server/0010-Validate-BlockState-and-SoundEvent-values.patch b/patches/removed/server/0010-Validate-BlockState-and-SoundEvent-values.patch similarity index 100% rename from patches/server/0010-Validate-BlockState-and-SoundEvent-values.patch rename to patches/removed/server/0010-Validate-BlockState-and-SoundEvent-values.patch diff --git a/patches/server/0011-Do-not-log-invalid-items-in-HoverEvent-and-ItemFrame.patch b/patches/removed/server/0011-Do-not-log-invalid-items-in-HoverEvent-and-ItemFrame.patch similarity index 100% rename from patches/server/0011-Do-not-log-invalid-items-in-HoverEvent-and-ItemFrame.patch rename to patches/removed/server/0011-Do-not-log-invalid-items-in-HoverEvent-and-ItemFrame.patch diff --git a/patches/server/0012-Change-version-fetcher-to-AMG.patch b/patches/removed/server/0012-Change-version-fetcher-to-AMG.patch similarity index 100% rename from patches/server/0012-Change-version-fetcher-to-AMG.patch rename to patches/removed/server/0012-Change-version-fetcher-to-AMG.patch diff --git a/patches/server/0013-Better-handling-of-invalid-JSON-components.patch b/patches/removed/server/0013-Better-handling-of-invalid-JSON-components.patch similarity index 100% rename from patches/server/0013-Better-handling-of-invalid-JSON-components.patch rename to patches/removed/server/0013-Better-handling-of-invalid-JSON-components.patch diff --git a/patches/server/0014-Block-server-side-chunkbans.patch b/patches/removed/server/0014-Block-server-side-chunkbans.patch similarity index 100% rename from patches/server/0014-Block-server-side-chunkbans.patch rename to patches/removed/server/0014-Block-server-side-chunkbans.patch diff --git a/patches/server/0015-Reject-oversized-components-from-updating.patch b/patches/removed/server/0015-Reject-oversized-components-from-updating.patch similarity index 100% rename from patches/server/0015-Reject-oversized-components-from-updating.patch rename to patches/removed/server/0015-Reject-oversized-components-from-updating.patch diff --git a/patches/server/0016-Add-Scissors-configuration-file-command.patch b/patches/removed/server/0016-Add-Scissors-configuration-file-command.patch similarity index 100% rename from patches/server/0016-Add-Scissors-configuration-file-command.patch rename to patches/removed/server/0016-Add-Scissors-configuration-file-command.patch diff --git a/patches/server/0017-Prevent-attributes-with-invalid-namespaces-from-bein.patch b/patches/removed/server/0017-Prevent-attributes-with-invalid-namespaces-from-bein.patch similarity index 100% rename from patches/server/0017-Prevent-attributes-with-invalid-namespaces-from-bein.patch rename to patches/removed/server/0017-Prevent-attributes-with-invalid-namespaces-from-bein.patch diff --git a/patches/server/0018-Don-t-query-player-data-in-the-nbt-component.patch b/patches/removed/server/0018-Don-t-query-player-data-in-the-nbt-component.patch similarity index 100% rename from patches/server/0018-Don-t-query-player-data-in-the-nbt-component.patch rename to patches/removed/server/0018-Don-t-query-player-data-in-the-nbt-component.patch diff --git a/patches/server/0019-Limit-string-tag-visitors-to-1024-elements.patch b/patches/removed/server/0019-Limit-string-tag-visitors-to-1024-elements.patch similarity index 100% rename from patches/server/0019-Limit-string-tag-visitors-to-1024-elements.patch rename to patches/removed/server/0019-Limit-string-tag-visitors-to-1024-elements.patch diff --git a/patches/server/0020-Fixes-creative-killing-potion-effects-and-certain-po.patch b/patches/removed/server/0020-Fixes-creative-killing-potion-effects-and-certain-po.patch similarity index 100% rename from patches/server/0020-Fixes-creative-killing-potion-effects-and-certain-po.patch rename to patches/removed/server/0020-Fixes-creative-killing-potion-effects-and-certain-po.patch diff --git a/patches/server/0021-Fix-negative-death-times.patch b/patches/removed/server/0021-Fix-negative-death-times.patch similarity index 100% rename from patches/server/0021-Fix-negative-death-times.patch rename to patches/removed/server/0021-Fix-negative-death-times.patch diff --git a/patches/server/0022-Limit-amount-of-vehicle-collision-checks-to-3-and-di.patch b/patches/removed/server/0022-Limit-amount-of-vehicle-collision-checks-to-3-and-di.patch similarity index 100% rename from patches/server/0022-Limit-amount-of-vehicle-collision-checks-to-3-and-di.patch rename to patches/removed/server/0022-Limit-amount-of-vehicle-collision-checks-to-3-and-di.patch diff --git a/patches/server/0023-Add-custom-classes-used-by-Scissors.patch b/patches/removed/server/0023-Add-custom-classes-used-by-Scissors.patch similarity index 100% rename from patches/server/0023-Add-custom-classes-used-by-Scissors.patch rename to patches/removed/server/0023-Add-custom-classes-used-by-Scissors.patch diff --git a/patches/server/0024-Reset-large-tags.patch b/patches/removed/server/0024-Reset-large-tags.patch similarity index 100% rename from patches/server/0024-Reset-large-tags.patch rename to patches/removed/server/0024-Reset-large-tags.patch diff --git a/patches/server/0025-Don-t-log-invalid-teams-to-console.patch b/patches/removed/server/0025-Don-t-log-invalid-teams-to-console.patch similarity index 100% rename from patches/server/0025-Don-t-log-invalid-teams-to-console.patch rename to patches/removed/server/0025-Don-t-log-invalid-teams-to-console.patch diff --git a/patches/server/0026-Fixes-out-of-bounds-HangingEntity-crash-exploit.patch b/patches/removed/server/0026-Fixes-out-of-bounds-HangingEntity-crash-exploit.patch similarity index 100% rename from patches/server/0026-Fixes-out-of-bounds-HangingEntity-crash-exploit.patch rename to patches/removed/server/0026-Fixes-out-of-bounds-HangingEntity-crash-exploit.patch diff --git a/patches/server/0027-Add-MasterBlockFireEvent.patch b/patches/removed/server/0027-Add-MasterBlockFireEvent.patch similarity index 100% rename from patches/server/0027-Add-MasterBlockFireEvent.patch rename to patches/removed/server/0027-Add-MasterBlockFireEvent.patch diff --git a/patches/server/0028-Add-spectator-teleport-event.patch b/patches/removed/server/0028-Add-spectator-teleport-event.patch similarity index 100% rename from patches/server/0028-Add-spectator-teleport-event.patch rename to patches/removed/server/0028-Add-spectator-teleport-event.patch diff --git a/patches/server/0029-Prevent-invalid-container-events.patch b/patches/removed/server/0029-Prevent-invalid-container-events.patch similarity index 100% rename from patches/server/0029-Prevent-invalid-container-events.patch rename to patches/removed/server/0029-Prevent-invalid-container-events.patch diff --git a/patches/server/0030-Disable-running-commands-in-books-by-default.patch b/patches/removed/server/0030-Disable-running-commands-in-books-by-default.patch similarity index 100% rename from patches/server/0030-Disable-running-commands-in-books-by-default.patch rename to patches/removed/server/0030-Disable-running-commands-in-books-by-default.patch diff --git a/patches/server/0031-Validate-block-entity-entity-tag-query-positions.patch b/patches/removed/server/0031-Validate-block-entity-entity-tag-query-positions.patch similarity index 100% rename from patches/server/0031-Validate-block-entity-entity-tag-query-positions.patch rename to patches/removed/server/0031-Validate-block-entity-entity-tag-query-positions.patch diff --git a/patches/server/0032-Fix-ClickEvents-on-Signs-bypassing-permissions.patch b/patches/removed/server/0032-Fix-ClickEvents-on-Signs-bypassing-permissions.patch similarity index 100% rename from patches/server/0032-Fix-ClickEvents-on-Signs-bypassing-permissions.patch rename to patches/removed/server/0032-Fix-ClickEvents-on-Signs-bypassing-permissions.patch diff --git a/patches/server/0033-Refuse-to-convert-legacy-messages-over-1k-characters.patch b/patches/removed/server/0033-Refuse-to-convert-legacy-messages-over-1k-characters.patch similarity index 100% rename from patches/server/0033-Refuse-to-convert-legacy-messages-over-1k-characters.patch rename to patches/removed/server/0033-Refuse-to-convert-legacy-messages-over-1k-characters.patch diff --git a/patches/server/0034-Prevent-velocity-freeze.patch b/patches/removed/server/0034-Prevent-velocity-freeze.patch similarity index 100% rename from patches/server/0034-Prevent-velocity-freeze.patch rename to patches/removed/server/0034-Prevent-velocity-freeze.patch diff --git a/patches/server/0035-Add-configuration-option-to-disable-chat-signatures.patch b/patches/removed/server/0035-Add-configuration-option-to-disable-chat-signatures.patch similarity index 100% rename from patches/server/0035-Add-configuration-option-to-disable-chat-signatures.patch rename to patches/removed/server/0035-Add-configuration-option-to-disable-chat-signatures.patch diff --git a/patches/server/0036-Patch-invalid-entity-rotation-log-spam.patch b/patches/removed/server/0036-Patch-invalid-entity-rotation-log-spam.patch similarity index 100% rename from patches/server/0036-Patch-invalid-entity-rotation-log-spam.patch rename to patches/removed/server/0036-Patch-invalid-entity-rotation-log-spam.patch diff --git a/patches/server/0037-Patch-large-selector-distance-crash.patch b/patches/removed/server/0037-Patch-large-selector-distance-crash.patch similarity index 100% rename from patches/server/0037-Patch-large-selector-distance-crash.patch rename to patches/removed/server/0037-Patch-large-selector-distance-crash.patch diff --git a/patches/server/0038-Limit-sculk-catalyst-cursor-positions.patch b/patches/removed/server/0038-Limit-sculk-catalyst-cursor-positions.patch similarity index 100% rename from patches/server/0038-Limit-sculk-catalyst-cursor-positions.patch rename to patches/removed/server/0038-Limit-sculk-catalyst-cursor-positions.patch diff --git a/patches/server/0039-Limit-map-decorations.patch b/patches/removed/server/0039-Limit-map-decorations.patch similarity index 100% rename from patches/server/0039-Limit-map-decorations.patch rename to patches/removed/server/0039-Limit-map-decorations.patch diff --git a/patches/server/0040-Prevent-player-banning-using-duplicate-UUIDs.patch b/patches/removed/server/0040-Prevent-player-banning-using-duplicate-UUIDs.patch similarity index 100% rename from patches/server/0040-Prevent-player-banning-using-duplicate-UUIDs.patch rename to patches/removed/server/0040-Prevent-player-banning-using-duplicate-UUIDs.patch diff --git a/patches/server/0041-Don-t-warn-on-duplicate-entity-UUIDs.patch b/patches/removed/server/0041-Don-t-warn-on-duplicate-entity-UUIDs.patch similarity index 100% rename from patches/server/0041-Don-t-warn-on-duplicate-entity-UUIDs.patch rename to patches/removed/server/0041-Don-t-warn-on-duplicate-entity-UUIDs.patch diff --git a/patches/server/0042-Fix-component-extra-empty-array-exploit.patch b/patches/removed/server/0042-Fix-component-extra-empty-array-exploit.patch similarity index 100% rename from patches/server/0042-Fix-component-extra-empty-array-exploit.patch rename to patches/removed/server/0042-Fix-component-extra-empty-array-exploit.patch diff --git a/patches/server/0043-Add-depth-limit-to-Component-deserializer.patch b/patches/removed/server/0043-Add-depth-limit-to-Component-deserializer.patch similarity index 100% rename from patches/server/0043-Add-depth-limit-to-Component-deserializer.patch rename to patches/removed/server/0043-Add-depth-limit-to-Component-deserializer.patch diff --git a/patches/server/0044-Implement-command-block-events.patch b/patches/removed/server/0044-Implement-command-block-events.patch similarity index 100% rename from patches/server/0044-Implement-command-block-events.patch rename to patches/removed/server/0044-Implement-command-block-events.patch diff --git a/patches/server/0045-Add-depth-limit-to-SNBT.patch b/patches/removed/server/0045-Add-depth-limit-to-SNBT.patch similarity index 100% rename from patches/server/0045-Add-depth-limit-to-SNBT.patch rename to patches/removed/server/0045-Add-depth-limit-to-SNBT.patch diff --git a/patches/server/0046-Limit-beacon-effectRange.patch b/patches/removed/server/0046-Limit-beacon-effectRange.patch similarity index 100% rename from patches/server/0046-Limit-beacon-effectRange.patch rename to patches/removed/server/0046-Limit-beacon-effectRange.patch diff --git a/patches/server/0047-Improve-validation-of-ResourceLocations.patch b/patches/removed/server/0047-Improve-validation-of-ResourceLocations.patch similarity index 100% rename from patches/server/0047-Improve-validation-of-ResourceLocations.patch rename to patches/removed/server/0047-Improve-validation-of-ResourceLocations.patch diff --git a/patches/server/0048-Don-t-log-on-too-many-chained-updates.patch b/patches/removed/server/0048-Don-t-log-on-too-many-chained-updates.patch similarity index 100% rename from patches/server/0048-Don-t-log-on-too-many-chained-updates.patch rename to patches/removed/server/0048-Don-t-log-on-too-many-chained-updates.patch diff --git a/patches/server/0049-Fix-packet-related-lag-exploits.patch b/patches/removed/server/0049-Fix-packet-related-lag-exploits.patch similarity index 100% rename from patches/server/0049-Fix-packet-related-lag-exploits.patch rename to patches/removed/server/0049-Fix-packet-related-lag-exploits.patch diff --git a/patches/server/0050-Limit-save-data-for-Bees-and-Vexes.patch b/patches/removed/server/0050-Limit-save-data-for-Bees-and-Vexes.patch similarity index 100% rename from patches/server/0050-Limit-save-data-for-Bees-and-Vexes.patch rename to patches/removed/server/0050-Limit-save-data-for-Bees-and-Vexes.patch diff --git a/patches/server/0051-Mute-invalid-attributes.patch b/patches/removed/server/0051-Mute-invalid-attributes.patch similarity index 100% rename from patches/server/0051-Mute-invalid-attributes.patch rename to patches/removed/server/0051-Mute-invalid-attributes.patch diff --git a/patches/server/0052-Mute-invalid-Enderdragon-phases.patch b/patches/removed/server/0052-Mute-invalid-Enderdragon-phases.patch similarity index 100% rename from patches/server/0052-Mute-invalid-Enderdragon-phases.patch rename to patches/removed/server/0052-Mute-invalid-Enderdragon-phases.patch diff --git a/patches/server/0053-Don-t-return-null-Components-in-the-Component-codec.patch b/patches/removed/server/0053-Don-t-return-null-Components-in-the-Component-codec.patch similarity index 100% rename from patches/server/0053-Don-t-return-null-Components-in-the-Component-codec.patch rename to patches/removed/server/0053-Don-t-return-null-Components-in-the-Component-codec.patch diff --git a/patches/server/0054-Add-length-limit-to-note-block-sound.patch b/patches/removed/server/0054-Add-length-limit-to-note-block-sound.patch similarity index 100% rename from patches/server/0054-Add-length-limit-to-note-block-sound.patch rename to patches/removed/server/0054-Add-length-limit-to-note-block-sound.patch diff --git a/patches/server/0001-Build-changes.patch b/patches/server/0001-Build-changes.patch index 890588e..e69dd97 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 fb98936bb8a5488db75d676c5bcb4060597fbbf8..904bf48288e0865db9bbe8d2ca183b8385f73407 100644 +index f1ade7432ae6fae1bceb90f975448ab43543942f..10ec7e0e6f91ee537834229f419332b1fae19773 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -13,8 +13,12 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) { @@ -16,7 +16,7 @@ index fb98936bb8a5488db75d676c5bcb4060597fbbf8..904bf48288e0865db9bbe8d2ca183b83 - implementation(project(":paper-mojangapi")) + // Scissors start + implementation(project(":Scissors-API")) -+ implementation("io.papermc.paper:paper-mojangapi:1.20.1-R0.1-SNAPSHOT") { ++ implementation("io.papermc.paper:paper-mojangapi:1.20.2-R0.1-SNAPSHOT") { + exclude("io.papermc.paper", "paper-api") + } + // Scissors end @@ -95,10 +95,10 @@ index c5d5648f4ca603ef2b1df723b58f9caf4dd3c722..21ded7c14c56a40feaa7741131be5166 .completer(new ConsoleCommandCompleter(this.server)) .option(LineReader.Option.COMPLETE_IN_WORD, true); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 67ee3a4ca8a6cdeb275653d492a1fea8037c51fb..318f6534cfb11f7fd05b2dcd6da4e0ca9f69f731 100644 +index 97745f0bab8d82d397c6c2a5775aed92bca0a034..2f511b9c5f48773c17a659c00a94ba3df82edf93 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1692,7 +1692,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop -Date: Sat, 12 Mar 2022 19:34:59 -0700 +From: Telesphoreo +Date: Sun, 24 Sep 2023 15:09:27 -0500 Subject: [PATCH] UUID validation diff --git a/src/main/java/net/minecraft/nbt/NbtUtils.java b/src/main/java/net/minecraft/nbt/NbtUtils.java -index 6dac24354192bea79a4b9eb721543110826790b2..a9c3c55eb622b18c74d8a9bd472e4e871d11b2aa 100644 +index b65dcff9812dbc3256c080ac264c4aafd83ce276..82b53a7bfb37bfa1752a016a8a454c0b994b9108 100644 --- a/src/main/java/net/minecraft/nbt/NbtUtils.java +++ b/src/main/java/net/minecraft/nbt/NbtUtils.java -@@ -78,7 +78,11 @@ public final class NbtUtils { - } +@@ -74,7 +74,11 @@ public final class NbtUtils { + UUID uUID = nbt.hasUUID("Id") ? nbt.getUUID("Id") : Util.NIL_UUID; // Paper start - support string UUID's - if (nbt.contains("Id", 8)) { + if (nbt.contains("Id", Tag.TAG_STRING)) { - uUID = UUID.fromString(nbt.getString("Id")); + // Scissors start - Validate String UUIDs in game profiles + try { @@ -20,7 +20,7 @@ index 6dac24354192bea79a4b9eb721543110826790b2..a9c3c55eb622b18c74d8a9bd472e4e87 + // Scissors end } // Paper end - + String string = nbt.getString("Name"); diff --git a/src/main/java/net/minecraft/network/chat/HoverEvent.java b/src/main/java/net/minecraft/network/chat/HoverEvent.java index 3ad05bbab726c59e7b67d9614af4b208d4520cb3..c0633f9553fb5aa52e8ffc863159521d09cb3bd5 100644 --- a/src/main/java/net/minecraft/network/chat/HoverEvent.java