mirror of
https://github.com/PaperMC/Paper.git
synced 2025-02-18 11:22:15 +01:00
Remove no longer needed patch
This commit is contained in:
parent
d1e1217a01
commit
897cc27c8b
13 changed files with 0 additions and 38 deletions
patches/server
0891-Add-PlayerStopUsingItemEvent.patch0891-Sign-cleanup-filtering.patch0892-FallingBlock-auto-expire-setting.patch0893-Don-t-tick-markers.patch0894-Do-not-accept-invalid-client-settings.patch0895-Add-support-for-Proxy-Protocol.patch0896-Fix-OfflinePlayer-getBedSpawnLocation.patch0897-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch0898-Sanitize-Sent-BlockEntity-NBT.patch0899-Prevent-entity-loading-causing-async-lookups.patch0900-Disable-component-selector-resolving-in-books-by-def.patch0901-Throw-exception-on-world-create-while-being-ticked.patch0902-Add-Alternate-Current-redstone-implementation.patch
|
@ -1,38 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Shane Freeder <theboyetronic@gmail.com>
|
||||
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;
|
Loading…
Add table
Reference in a new issue