From 6b23f8bc8f4ad8d531713f7f177b7f1fd3de4c0b Mon Sep 17 00:00:00 2001 From: Telesphoreo Date: Sat, 10 Dec 2022 22:28:09 -0600 Subject: [PATCH] Begin work on 1.19.3 Only got through one patch as of now. Not publishing JARs to Jenkins for now --- Jenkinsfile | 4 ++-- gradle.properties | 6 +++--- .../api/0003-Add-Scissors-configuration-file.patch | 4 ++-- ...id-LootTables-causing-problems-when-appli.patch | 0 ...pam-caused-by-invalid-entities-in-beehive.patch | 0 .../0005-Fixes-the-Blank-SkullOwner-exploit.patch | 0 ...0006-Removes-useless-spammy-error-logging.patch | 0 ...rs-thrown-when-trying-to-remove-minecart-.patch | 0 ...Check-if-items-are-air-before-calling-set.patch | 0 ...edge-Books-causing-log-spam-when-invalid-.patch | 0 ...Validate-BlockState-and-SoundEvent-values.patch | 0 ...esourceLocation-validation-and-log-spam-f.patch | 0 ...invalid-items-in-HoverEvent-and-ItemFrame.patch | 0 ...13-Even-more-resource-location-validation.patch | 0 .../0014-Change-version-fetcher-to-AMG.patch | 0 ...ributes-with-invalid-namespaces-from-bein.patch | 0 ...ring-UUIDs-during-the-CompoundTag-GamePro.patch | 0 ...-t-query-player-data-in-the-nbt-component.patch | 0 .../0018-Limit-ListTags-to-1024-elements.patch | 0 ...ive-killing-potion-effects-and-certain-po.patch | 0 .../0020-Fix-negative-death-times.patch | 0 .../0021-Add-custom-classes-used-by-Scissors.patch | 0 ...ordinates-before-attempting-to-get-block-.patch | 0 .../0023-Reset-large-tags.patch | 0 .../0024-Account-for-items-inside-containers.patch | 0 ...t-of-vehicle-collision-checks-to-3-and-di.patch | 0 .../0026-Don-t-log-invalid-teams-to-console.patch | 0 ...etter-handling-of-invalid-JSON-components.patch | 0 ...Reject-oversized-components-from-updating.patch | 0 .../0029-Block-server-side-chunkbans.patch | 0 .../0030-Add-MasterBlockFireEvent.patch | 0 .../0031-Add-spectator-teleport-event.patch | 0 .../0032-Prevent-invalid-container-events.patch | 0 ...3-Do-not-attempt-to-cast-items-to-recipes.patch | 0 ...4-Add-Scissors-configuration-file-command.patch | 0 ...able-running-commands-in-books-by-default.patch | 0 ...Validate-block-entity-tag-query-positions.patch | 0 ...lickEvents-on-Signs-bypassing-permissions.patch | 0 ...uration-option-to-disable-chat-signatures.patch | 0 ...onvert-legacy-messages-over-1k-characters.patch | 0 ...out-of-bounds-HangingEntity-crash-exploit.patch | 0 .../0041-Prevent-velocity-freeze.patch | 0 patches/server/0001-Build-changes.patch | 14 +++++++------- ...-when-a-show_entity-hover-event-s-UUID-is.patch | 10 +++++----- 44 files changed, 19 insertions(+), 19 deletions(-) rename patches/{server => removed}/0003-Fixes-invalid-LootTables-causing-problems-when-appli.patch (100%) rename patches/{server => removed}/0004-Fixes-log-spam-caused-by-invalid-entities-in-beehive.patch (100%) rename patches/{server => removed}/0005-Fixes-the-Blank-SkullOwner-exploit.patch (100%) rename patches/{server => removed}/0006-Removes-useless-spammy-error-logging.patch (100%) rename patches/{server => removed}/0007-Ignore-errors-thrown-when-trying-to-remove-minecart-.patch (100%) rename patches/{server => removed}/0008-ItemEntity-Check-if-items-are-air-before-calling-set.patch (100%) rename patches/{server => removed}/0009-Fixes-Knowledge-Books-causing-log-spam-when-invalid-.patch (100%) rename patches/{server => removed}/0010-Validate-BlockState-and-SoundEvent-values.patch (100%) rename patches/{server => removed}/0011-Even-more-ResourceLocation-validation-and-log-spam-f.patch (100%) rename patches/{server => removed}/0012-Do-not-log-invalid-items-in-HoverEvent-and-ItemFrame.patch (100%) rename patches/{server => removed}/0013-Even-more-resource-location-validation.patch (100%) rename patches/{server => removed}/0014-Change-version-fetcher-to-AMG.patch (100%) rename patches/{server => removed}/0015-Prevent-attributes-with-invalid-namespaces-from-bein.patch (100%) rename patches/{server => removed}/0016-Validate-String-UUIDs-during-the-CompoundTag-GamePro.patch (100%) rename patches/{server => removed}/0017-Don-t-query-player-data-in-the-nbt-component.patch (100%) rename patches/{server => removed}/0018-Limit-ListTags-to-1024-elements.patch (100%) rename patches/{server => removed}/0019-Fixes-creative-killing-potion-effects-and-certain-po.patch (100%) rename patches/{server => removed}/0020-Fix-negative-death-times.patch (100%) rename patches/{server => removed}/0021-Add-custom-classes-used-by-Scissors.patch (100%) rename patches/{server => removed}/0022-Validate-coordinates-before-attempting-to-get-block-.patch (100%) rename patches/{server => removed}/0023-Reset-large-tags.patch (100%) rename patches/{server => removed}/0024-Account-for-items-inside-containers.patch (100%) rename patches/{server => removed}/0025-Limit-amount-of-vehicle-collision-checks-to-3-and-di.patch (100%) rename patches/{server => removed}/0026-Don-t-log-invalid-teams-to-console.patch (100%) rename patches/{server => removed}/0027-Better-handling-of-invalid-JSON-components.patch (100%) rename patches/{server => removed}/0028-Reject-oversized-components-from-updating.patch (100%) rename patches/{server => removed}/0029-Block-server-side-chunkbans.patch (100%) rename patches/{server => removed}/0030-Add-MasterBlockFireEvent.patch (100%) rename patches/{server => removed}/0031-Add-spectator-teleport-event.patch (100%) rename patches/{server => removed}/0032-Prevent-invalid-container-events.patch (100%) rename patches/{server => removed}/0033-Do-not-attempt-to-cast-items-to-recipes.patch (100%) rename patches/{server => removed}/0034-Add-Scissors-configuration-file-command.patch (100%) rename patches/{server => removed}/0035-Disable-running-commands-in-books-by-default.patch (100%) rename patches/{server => removed}/0036-Validate-block-entity-tag-query-positions.patch (100%) rename patches/{server => removed}/0037-Fix-ClickEvents-on-Signs-bypassing-permissions.patch (100%) rename patches/{server => removed}/0038-Add-configuration-option-to-disable-chat-signatures.patch (100%) rename patches/{server => removed}/0039-Refuse-to-convert-legacy-messages-over-1k-characters.patch (100%) rename patches/{server => removed}/0040-Fixes-out-of-bounds-HangingEntity-crash-exploit.patch (100%) rename patches/{server => removed}/0041-Prevent-velocity-freeze.patch (100%) diff --git a/Jenkinsfile b/Jenkinsfile index 5223a21..d81e1cb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -27,7 +27,7 @@ pipeline { } stage('publish') { when { - branch "1.19.2" + branch "skip" } steps { withCredentials([usernamePassword(credentialsId: '8150559b-ec1d-41bd-a576-aa668a52c1ba', passwordVariable: 'scissorsPassword', usernameVariable: 'scissorsUser')]) { @@ -40,7 +40,7 @@ pipeline { } post { always { - archiveArtifacts artifacts: 'build/libs/Scissors-paperclip-*.jar', fingerprint: true + // archiveArtifacts artifacts: 'build/libs/Scissors-paperclip-*.jar', fingerprint: true junit 'Scissors-Server/build/test-results/test/*.xml' junit 'Scissors-API/build/test-results/test/*.xml' cleanWs() diff --git a/gradle.properties b/gradle.properties index 31365ad..2c10cb0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +1,8 @@ group=me.totalfreedom.scissors -version=1.19.2-R0.1-SNAPSHOT +version=1.19.3-R0.1-SNAPSHOT -mcVersion=1.19.2 -paperRef=476ef25d053c523aea416487a38f72011d72a9cf +mcVersion=1.19.3 +paperRef=1143b636634183fe9ee6d8cf9709afd4b3239de4 org.gradle.caching=true org.gradle.parallel=true diff --git a/patches/api/0003-Add-Scissors-configuration-file.patch b/patches/api/0003-Add-Scissors-configuration-file.patch index 77393b0..f7cf3d5 100644 --- a/patches/api/0003-Add-Scissors-configuration-file.patch +++ b/patches/api/0003-Add-Scissors-configuration-file.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add Scissors configuration file diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index e43fef0152468944d8a33036344a43e95fe58476..ec79086cb61d4207c4228bc97a7cc49555aea622 100644 +index 2204336d8800311b65e894739ab1b27273e7c6f2..766d0143290cfc5062c548c2361316dbddca9afe 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1969,6 +1969,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1971,6 +1971,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi } // Paper end diff --git a/patches/server/0003-Fixes-invalid-LootTables-causing-problems-when-appli.patch b/patches/removed/0003-Fixes-invalid-LootTables-causing-problems-when-appli.patch similarity index 100% rename from patches/server/0003-Fixes-invalid-LootTables-causing-problems-when-appli.patch rename to patches/removed/0003-Fixes-invalid-LootTables-causing-problems-when-appli.patch diff --git a/patches/server/0004-Fixes-log-spam-caused-by-invalid-entities-in-beehive.patch b/patches/removed/0004-Fixes-log-spam-caused-by-invalid-entities-in-beehive.patch similarity index 100% rename from patches/server/0004-Fixes-log-spam-caused-by-invalid-entities-in-beehive.patch rename to patches/removed/0004-Fixes-log-spam-caused-by-invalid-entities-in-beehive.patch diff --git a/patches/server/0005-Fixes-the-Blank-SkullOwner-exploit.patch b/patches/removed/0005-Fixes-the-Blank-SkullOwner-exploit.patch similarity index 100% rename from patches/server/0005-Fixes-the-Blank-SkullOwner-exploit.patch rename to patches/removed/0005-Fixes-the-Blank-SkullOwner-exploit.patch diff --git a/patches/server/0006-Removes-useless-spammy-error-logging.patch b/patches/removed/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/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/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/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/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/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/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/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/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/0010-Validate-BlockState-and-SoundEvent-values.patch diff --git a/patches/server/0011-Even-more-ResourceLocation-validation-and-log-spam-f.patch b/patches/removed/0011-Even-more-ResourceLocation-validation-and-log-spam-f.patch similarity index 100% rename from patches/server/0011-Even-more-ResourceLocation-validation-and-log-spam-f.patch rename to patches/removed/0011-Even-more-ResourceLocation-validation-and-log-spam-f.patch diff --git a/patches/server/0012-Do-not-log-invalid-items-in-HoverEvent-and-ItemFrame.patch b/patches/removed/0012-Do-not-log-invalid-items-in-HoverEvent-and-ItemFrame.patch similarity index 100% rename from patches/server/0012-Do-not-log-invalid-items-in-HoverEvent-and-ItemFrame.patch rename to patches/removed/0012-Do-not-log-invalid-items-in-HoverEvent-and-ItemFrame.patch diff --git a/patches/server/0013-Even-more-resource-location-validation.patch b/patches/removed/0013-Even-more-resource-location-validation.patch similarity index 100% rename from patches/server/0013-Even-more-resource-location-validation.patch rename to patches/removed/0013-Even-more-resource-location-validation.patch diff --git a/patches/server/0014-Change-version-fetcher-to-AMG.patch b/patches/removed/0014-Change-version-fetcher-to-AMG.patch similarity index 100% rename from patches/server/0014-Change-version-fetcher-to-AMG.patch rename to patches/removed/0014-Change-version-fetcher-to-AMG.patch diff --git a/patches/server/0015-Prevent-attributes-with-invalid-namespaces-from-bein.patch b/patches/removed/0015-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/removed/0015-Prevent-attributes-with-invalid-namespaces-from-bein.patch diff --git a/patches/server/0016-Validate-String-UUIDs-during-the-CompoundTag-GamePro.patch b/patches/removed/0016-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/removed/0016-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/removed/0017-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/removed/0017-Don-t-query-player-data-in-the-nbt-component.patch diff --git a/patches/server/0018-Limit-ListTags-to-1024-elements.patch b/patches/removed/0018-Limit-ListTags-to-1024-elements.patch similarity index 100% rename from patches/server/0018-Limit-ListTags-to-1024-elements.patch rename to patches/removed/0018-Limit-ListTags-to-1024-elements.patch diff --git a/patches/server/0019-Fixes-creative-killing-potion-effects-and-certain-po.patch b/patches/removed/0019-Fixes-creative-killing-potion-effects-and-certain-po.patch similarity index 100% rename from patches/server/0019-Fixes-creative-killing-potion-effects-and-certain-po.patch rename to patches/removed/0019-Fixes-creative-killing-potion-effects-and-certain-po.patch diff --git a/patches/server/0020-Fix-negative-death-times.patch b/patches/removed/0020-Fix-negative-death-times.patch similarity index 100% rename from patches/server/0020-Fix-negative-death-times.patch rename to patches/removed/0020-Fix-negative-death-times.patch diff --git a/patches/server/0021-Add-custom-classes-used-by-Scissors.patch b/patches/removed/0021-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/removed/0021-Add-custom-classes-used-by-Scissors.patch diff --git a/patches/server/0022-Validate-coordinates-before-attempting-to-get-block-.patch b/patches/removed/0022-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/removed/0022-Validate-coordinates-before-attempting-to-get-block-.patch diff --git a/patches/server/0023-Reset-large-tags.patch b/patches/removed/0023-Reset-large-tags.patch similarity index 100% rename from patches/server/0023-Reset-large-tags.patch rename to patches/removed/0023-Reset-large-tags.patch diff --git a/patches/server/0024-Account-for-items-inside-containers.patch b/patches/removed/0024-Account-for-items-inside-containers.patch similarity index 100% rename from patches/server/0024-Account-for-items-inside-containers.patch rename to patches/removed/0024-Account-for-items-inside-containers.patch diff --git a/patches/server/0025-Limit-amount-of-vehicle-collision-checks-to-3-and-di.patch b/patches/removed/0025-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/removed/0025-Limit-amount-of-vehicle-collision-checks-to-3-and-di.patch diff --git a/patches/server/0026-Don-t-log-invalid-teams-to-console.patch b/patches/removed/0026-Don-t-log-invalid-teams-to-console.patch similarity index 100% rename from patches/server/0026-Don-t-log-invalid-teams-to-console.patch rename to patches/removed/0026-Don-t-log-invalid-teams-to-console.patch diff --git a/patches/server/0027-Better-handling-of-invalid-JSON-components.patch b/patches/removed/0027-Better-handling-of-invalid-JSON-components.patch similarity index 100% rename from patches/server/0027-Better-handling-of-invalid-JSON-components.patch rename to patches/removed/0027-Better-handling-of-invalid-JSON-components.patch diff --git a/patches/server/0028-Reject-oversized-components-from-updating.patch b/patches/removed/0028-Reject-oversized-components-from-updating.patch similarity index 100% rename from patches/server/0028-Reject-oversized-components-from-updating.patch rename to patches/removed/0028-Reject-oversized-components-from-updating.patch diff --git a/patches/server/0029-Block-server-side-chunkbans.patch b/patches/removed/0029-Block-server-side-chunkbans.patch similarity index 100% rename from patches/server/0029-Block-server-side-chunkbans.patch rename to patches/removed/0029-Block-server-side-chunkbans.patch diff --git a/patches/server/0030-Add-MasterBlockFireEvent.patch b/patches/removed/0030-Add-MasterBlockFireEvent.patch similarity index 100% rename from patches/server/0030-Add-MasterBlockFireEvent.patch rename to patches/removed/0030-Add-MasterBlockFireEvent.patch diff --git a/patches/server/0031-Add-spectator-teleport-event.patch b/patches/removed/0031-Add-spectator-teleport-event.patch similarity index 100% rename from patches/server/0031-Add-spectator-teleport-event.patch rename to patches/removed/0031-Add-spectator-teleport-event.patch diff --git a/patches/server/0032-Prevent-invalid-container-events.patch b/patches/removed/0032-Prevent-invalid-container-events.patch similarity index 100% rename from patches/server/0032-Prevent-invalid-container-events.patch rename to patches/removed/0032-Prevent-invalid-container-events.patch diff --git a/patches/server/0033-Do-not-attempt-to-cast-items-to-recipes.patch b/patches/removed/0033-Do-not-attempt-to-cast-items-to-recipes.patch similarity index 100% rename from patches/server/0033-Do-not-attempt-to-cast-items-to-recipes.patch rename to patches/removed/0033-Do-not-attempt-to-cast-items-to-recipes.patch diff --git a/patches/server/0034-Add-Scissors-configuration-file-command.patch b/patches/removed/0034-Add-Scissors-configuration-file-command.patch similarity index 100% rename from patches/server/0034-Add-Scissors-configuration-file-command.patch rename to patches/removed/0034-Add-Scissors-configuration-file-command.patch diff --git a/patches/server/0035-Disable-running-commands-in-books-by-default.patch b/patches/removed/0035-Disable-running-commands-in-books-by-default.patch similarity index 100% rename from patches/server/0035-Disable-running-commands-in-books-by-default.patch rename to patches/removed/0035-Disable-running-commands-in-books-by-default.patch diff --git a/patches/server/0036-Validate-block-entity-tag-query-positions.patch b/patches/removed/0036-Validate-block-entity-tag-query-positions.patch similarity index 100% rename from patches/server/0036-Validate-block-entity-tag-query-positions.patch rename to patches/removed/0036-Validate-block-entity-tag-query-positions.patch diff --git a/patches/server/0037-Fix-ClickEvents-on-Signs-bypassing-permissions.patch b/patches/removed/0037-Fix-ClickEvents-on-Signs-bypassing-permissions.patch similarity index 100% rename from patches/server/0037-Fix-ClickEvents-on-Signs-bypassing-permissions.patch rename to patches/removed/0037-Fix-ClickEvents-on-Signs-bypassing-permissions.patch diff --git a/patches/server/0038-Add-configuration-option-to-disable-chat-signatures.patch b/patches/removed/0038-Add-configuration-option-to-disable-chat-signatures.patch similarity index 100% rename from patches/server/0038-Add-configuration-option-to-disable-chat-signatures.patch rename to patches/removed/0038-Add-configuration-option-to-disable-chat-signatures.patch diff --git a/patches/server/0039-Refuse-to-convert-legacy-messages-over-1k-characters.patch b/patches/removed/0039-Refuse-to-convert-legacy-messages-over-1k-characters.patch similarity index 100% rename from patches/server/0039-Refuse-to-convert-legacy-messages-over-1k-characters.patch rename to patches/removed/0039-Refuse-to-convert-legacy-messages-over-1k-characters.patch diff --git a/patches/server/0040-Fixes-out-of-bounds-HangingEntity-crash-exploit.patch b/patches/removed/0040-Fixes-out-of-bounds-HangingEntity-crash-exploit.patch similarity index 100% rename from patches/server/0040-Fixes-out-of-bounds-HangingEntity-crash-exploit.patch rename to patches/removed/0040-Fixes-out-of-bounds-HangingEntity-crash-exploit.patch diff --git a/patches/server/0041-Prevent-velocity-freeze.patch b/patches/removed/0041-Prevent-velocity-freeze.patch similarity index 100% rename from patches/server/0041-Prevent-velocity-freeze.patch rename to patches/removed/0041-Prevent-velocity-freeze.patch diff --git a/patches/server/0001-Build-changes.patch b/patches/server/0001-Build-changes.patch index 7c98942..8df0309 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 b0e4f11e8af4b909a56bb5576d05ef0537fb25f7..fa6ba78782af95efa65b32f662f5ebb565cfa183 100644 +index d5d49bb2b47c889e12d17dc87b8c439a60b3fe67..936341d202df27fca75109b3e9a2b5ffffdbe47b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,8 +7,10 @@ plugins { @@ -15,13 +15,13 @@ index b0e4f11e8af4b909a56bb5576d05ef0537fb25f7..fa6ba78782af95efa65b32f662f5ebb5 - implementation(project(":paper-api")) - implementation(project(":paper-mojangapi")) + implementation(project(":Scissors-API")) -+ implementation("io.papermc.paper:paper-mojangapi:1.19.2-R0.1-SNAPSHOT") { ++ implementation("io.papermc.paper:paper-mojangapi:1.19.3-R0.1-SNAPSHOT") { + exclude("io.papermc.paper", "paper-api") + } // Paper start implementation("org.jline:jline-terminal-jansi:3.21.0") implementation("net.minecrell:terminalconsoleappender:1.3.0") -@@ -58,11 +60,17 @@ tasks.jar { +@@ -57,11 +59,17 @@ 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 @@ -41,7 +41,7 @@ index b0e4f11e8af4b909a56bb5576d05ef0537fb25f7..fa6ba78782af95efa65b32f662f5ebb5 "Implementation-Vendor" to date, // Paper "Specification-Title" to "Bukkit", "Specification-Version" to project.version, -@@ -134,7 +142,7 @@ fun TaskContainer.registerRunTask( +@@ -133,7 +141,7 @@ fun TaskContainer.registerRunTask( name: String, block: JavaExec.() -> Unit ): TaskProvider = register(name) { @@ -51,7 +51,7 @@ index b0e4f11e8af4b909a56bb5576d05ef0537fb25f7..fa6ba78782af95efa65b32f662f5ebb5 standardInput = System.`in` workingDir = rootProject.layout.projectDirectory diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 6dc6c3bccb4ba34268a87b0754c87eb1e0df4135..0ef065d4d193841ccaca21df70f55cdd5fe15455 100644 +index 710ca7d3a5659953f64bc6dccdd93b43300961cc..ad9cd0987098c8969fdf002969188458b0398924 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1654,7 +1654,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop -Date: Sat, 12 Mar 2022 19:34:59 -0700 +From: Telesphoreo +Date: Sat, 10 Dec 2022 22:25:38 -0600 Subject: [PATCH] Return null when a show_entity hover event's UUID isn't valid diff --git a/src/main/java/net/minecraft/network/chat/HoverEvent.java b/src/main/java/net/minecraft/network/chat/HoverEvent.java -index 587db9a70f8f930412d34c4a412c19a30faa2a4e..b50cd7a39c077dcbabdfea1b9290bf5b144d4384 100644 +index 3ad05bbab726c59e7b67d9614af4b208d4520cb3..c0633f9553fb5aa52e8ffc863159521d09cb3bd5 100644 --- a/src/main/java/net/minecraft/network/chat/HoverEvent.java +++ b/src/main/java/net/minecraft/network/chat/HoverEvent.java @@ -174,7 +174,14 @@ public class HoverEvent { } else { JsonObject jsonObject = json.getAsJsonObject(); - EntityType entityType = Registry.ENTITY_TYPE.get(new ResourceLocation(GsonHelper.getAsString(jsonObject, "type"))); + EntityType entityType = BuiltInRegistries.ENTITY_TYPE.get(new ResourceLocation(GsonHelper.getAsString(jsonObject, "type"))); - UUID uUID = UUID.fromString(GsonHelper.getAsString(jsonObject, "id")); + // Scissors start + UUID uUID; @@ -27,7 +27,7 @@ index 587db9a70f8f930412d34c4a412c19a30faa2a4e..b50cd7a39c077dcbabdfea1b9290bf5b @@ -186,7 +193,14 @@ public class HoverEvent { CompoundTag compoundTag = TagParser.parseTag(text.getString()); Component component = Component.Serializer.fromJson(compoundTag.getString("name")); - EntityType entityType = Registry.ENTITY_TYPE.get(new ResourceLocation(compoundTag.getString("type"))); + EntityType entityType = BuiltInRegistries.ENTITY_TYPE.get(new ResourceLocation(compoundTag.getString("type"))); - UUID uUID = UUID.fromString(compoundTag.getString("id")); + // Scissors start + UUID uUID;