From 897cc27c8bdfd56b9e535465a68e5e58515b258d Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Wed, 8 Jun 2022 20:06:04 +0200 Subject: [PATCH] Remove no longer needed patch --- ...> 0891-Add-PlayerStopUsingItemEvent.patch} | 0 .../server/0891-Sign-cleanup-filtering.patch | 38 ------------------- ...92-FallingBlock-auto-expire-setting.patch} | 0 ...rs.patch => 0893-Don-t-tick-markers.patch} | 0 ...-not-accept-invalid-client-settings.patch} | 0 ...0895-Add-support-for-Proxy-Protocol.patch} | 0 ...x-OfflinePlayer-getBedSpawnLocation.patch} | 0 ...tory-for-smokers-and-blast-furnaces.patch} | 0 ... 0898-Sanitize-Sent-BlockEntity-NBT.patch} | 0 ...ntity-loading-causing-async-lookups.patch} | 0 ...-selector-resolving-in-books-by-def.patch} | 0 ...-on-world-create-while-being-ticked.patch} | 0 ...ate-Current-redstone-implementation.patch} | 0 13 files changed, 38 deletions(-) rename patches/server/{0892-Add-PlayerStopUsingItemEvent.patch => 0891-Add-PlayerStopUsingItemEvent.patch} (100%) delete mode 100644 patches/server/0891-Sign-cleanup-filtering.patch rename patches/server/{0893-FallingBlock-auto-expire-setting.patch => 0892-FallingBlock-auto-expire-setting.patch} (100%) rename patches/server/{0894-Don-t-tick-markers.patch => 0893-Don-t-tick-markers.patch} (100%) rename patches/server/{0895-Do-not-accept-invalid-client-settings.patch => 0894-Do-not-accept-invalid-client-settings.patch} (100%) rename patches/server/{0896-Add-support-for-Proxy-Protocol.patch => 0895-Add-support-for-Proxy-Protocol.patch} (100%) rename patches/server/{0897-Fix-OfflinePlayer-getBedSpawnLocation.patch => 0896-Fix-OfflinePlayer-getBedSpawnLocation.patch} (100%) rename patches/server/{0898-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch => 0897-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch} (100%) rename patches/server/{0899-Sanitize-Sent-BlockEntity-NBT.patch => 0898-Sanitize-Sent-BlockEntity-NBT.patch} (100%) rename patches/server/{0900-Prevent-entity-loading-causing-async-lookups.patch => 0899-Prevent-entity-loading-causing-async-lookups.patch} (100%) rename patches/server/{0901-Disable-component-selector-resolving-in-books-by-def.patch => 0900-Disable-component-selector-resolving-in-books-by-def.patch} (100%) rename patches/server/{0902-Throw-exception-on-world-create-while-being-ticked.patch => 0901-Throw-exception-on-world-create-while-being-ticked.patch} (100%) rename patches/server/{0903-Add-Alternate-Current-redstone-implementation.patch => 0902-Add-Alternate-Current-redstone-implementation.patch} (100%) diff --git a/patches/server/0892-Add-PlayerStopUsingItemEvent.patch b/patches/server/0891-Add-PlayerStopUsingItemEvent.patch similarity index 100% rename from patches/server/0892-Add-PlayerStopUsingItemEvent.patch rename to patches/server/0891-Add-PlayerStopUsingItemEvent.patch diff --git a/patches/server/0891-Sign-cleanup-filtering.patch b/patches/server/0891-Sign-cleanup-filtering.patch deleted file mode 100644 index 9dcb81df24..0000000000 --- a/patches/server/0891-Sign-cleanup-filtering.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Shane Freeder -Date: Sat, 30 Apr 2022 00:38:57 +0100 -Subject: [PATCH] Sign cleanup filtering - -TODO: This logic here should be moved into a DataFixer in the next MC release -noting to ensure to apply the cleanup logic here, and clean up the added -tags - -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 517f9c6df4427f21ebac17a298a57e28d53e6fd0..504ee81804f3b55590ee053f50481774524bb9b1 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 -@@ -72,6 +72,7 @@ public class SignBlockEntity extends BlockEntity implements CommandSource { // C - } - // CraftBukkit end - -+ nbt.putBoolean("Paper.cleanedFiltered", true); // Paper - nbt.putString("Color", this.color.getName()); - nbt.putBoolean("GlowingText", this.hasGlowingText); - } -@@ -88,6 +89,7 @@ public class SignBlockEntity extends BlockEntity implements CommandSource { // C - boolean oldSign = Boolean.getBoolean("convertLegacySigns") && !nbt.getBoolean("Bukkit.isConverted"); - // CraftBukkit end - -+ boolean cleanedFiltered = nbt.getBoolean("Paper.cleanedFiltered"); // Paper - for (int i = 0; i < 4; ++i) { - String s = nbt.getString(SignBlockEntity.RAW_TEXT_FIELD_NAMES[i]); - // CraftBukkit start -@@ -105,7 +107,7 @@ public class SignBlockEntity extends BlockEntity implements CommandSource { // C - this.messages[i] = ichatbasecomponent; - String s1 = SignBlockEntity.FILTERED_TEXT_FIELD_NAMES[i]; - -- if (nbt.contains(s1, 8)) { -+ if (cleanedFiltered && nbt.contains(s1, 8)) { // Paper - this.filteredMessages[i] = this.loadLine(nbt.getString(s1)); - } else { - this.filteredMessages[i] = ichatbasecomponent; diff --git a/patches/server/0893-FallingBlock-auto-expire-setting.patch b/patches/server/0892-FallingBlock-auto-expire-setting.patch similarity index 100% rename from patches/server/0893-FallingBlock-auto-expire-setting.patch rename to patches/server/0892-FallingBlock-auto-expire-setting.patch diff --git a/patches/server/0894-Don-t-tick-markers.patch b/patches/server/0893-Don-t-tick-markers.patch similarity index 100% rename from patches/server/0894-Don-t-tick-markers.patch rename to patches/server/0893-Don-t-tick-markers.patch diff --git a/patches/server/0895-Do-not-accept-invalid-client-settings.patch b/patches/server/0894-Do-not-accept-invalid-client-settings.patch similarity index 100% rename from patches/server/0895-Do-not-accept-invalid-client-settings.patch rename to patches/server/0894-Do-not-accept-invalid-client-settings.patch diff --git a/patches/server/0896-Add-support-for-Proxy-Protocol.patch b/patches/server/0895-Add-support-for-Proxy-Protocol.patch similarity index 100% rename from patches/server/0896-Add-support-for-Proxy-Protocol.patch rename to patches/server/0895-Add-support-for-Proxy-Protocol.patch diff --git a/patches/server/0897-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0896-Fix-OfflinePlayer-getBedSpawnLocation.patch similarity index 100% rename from patches/server/0897-Fix-OfflinePlayer-getBedSpawnLocation.patch rename to patches/server/0896-Fix-OfflinePlayer-getBedSpawnLocation.patch diff --git a/patches/server/0898-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0897-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch similarity index 100% rename from patches/server/0898-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch rename to patches/server/0897-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch diff --git a/patches/server/0899-Sanitize-Sent-BlockEntity-NBT.patch b/patches/server/0898-Sanitize-Sent-BlockEntity-NBT.patch similarity index 100% rename from patches/server/0899-Sanitize-Sent-BlockEntity-NBT.patch rename to patches/server/0898-Sanitize-Sent-BlockEntity-NBT.patch diff --git a/patches/server/0900-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0899-Prevent-entity-loading-causing-async-lookups.patch similarity index 100% rename from patches/server/0900-Prevent-entity-loading-causing-async-lookups.patch rename to patches/server/0899-Prevent-entity-loading-causing-async-lookups.patch diff --git a/patches/server/0901-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0900-Disable-component-selector-resolving-in-books-by-def.patch similarity index 100% rename from patches/server/0901-Disable-component-selector-resolving-in-books-by-def.patch rename to patches/server/0900-Disable-component-selector-resolving-in-books-by-def.patch diff --git a/patches/server/0902-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0901-Throw-exception-on-world-create-while-being-ticked.patch similarity index 100% rename from patches/server/0902-Throw-exception-on-world-create-while-being-ticked.patch rename to patches/server/0901-Throw-exception-on-world-create-while-being-ticked.patch diff --git a/patches/server/0903-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0902-Add-Alternate-Current-redstone-implementation.patch similarity index 100% rename from patches/server/0903-Add-Alternate-Current-redstone-implementation.patch rename to patches/server/0902-Add-Alternate-Current-redstone-implementation.patch