From 13786438fc614d747a0a13fa486b822b0434218d Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Mon, 3 Jan 2022 10:17:27 +0100 Subject: [PATCH] Fix filtered text not being applied on sign update Fixes #7266 --- patches/server/Adventure.patch | 2 +- patches/server/Fix-tripwire-state-inconsistency.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/server/Adventure.patch b/patches/server/Adventure.patch index 7aef1b2181..1696944046 100644 --- a/patches/server/Adventure.patch +++ b/patches/server/Adventure.patch @@ -2073,7 +2073,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 continue; // The line contents are still the same, skip. } - sign.setMessage(i, CraftChatMessage.fromString(line)[0]); -+ sign.messages[i] = io.papermc.paper.adventure.PaperAdventure.asVanilla(component); ++ sign.setMessage(i, io.papermc.paper.adventure.PaperAdventure.asVanilla(component)); } + // Paper end } diff --git a/patches/server/Fix-tripwire-state-inconsistency.patch b/patches/server/Fix-tripwire-state-inconsistency.patch index 41e1d819e3..d26eb71398 100644 --- a/patches/server/Fix-tripwire-state-inconsistency.patch +++ b/patches/server/Fix-tripwire-state-inconsistency.patch @@ -61,7 +61,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 boolean flag7 = (Boolean) iblockdata2.getValue(TripWireBlock.POWERED); flag5 |= flag6 && flag7; -+ if (!tripWireBeingRemoved || (k == i && !flag6)) // Paper - don't update the tripwire again if being removed and not disarmed ++ if (k != i || !tripWireBeingRemoved || !flag6)) // Paper - don't update the tripwire again if being removed and not disarmed aiblockdata[k] = iblockdata2; if (k == i) { world.scheduleTick(pos, (Block) this, 10);