Skip to content

Commit 00d6cca

Browse files
committed
Fix filtered text not being applied on sign update
Fixes #7266
1 parent eb98398 commit 00d6cca

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

patches/server/0012-Adventure.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1981,7 +1981,7 @@ index 0beb96dc896f63003e1b1ae458b73902bdbe648a..102eb86bad3000f258775ac06ecd1a6d
19811981
public String getCustomName() {
19821982
EnchantmentTableBlockEntity enchant = this.getSnapshot();
19831983
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
1984-
index 9e68893b189ad05e4d2a5e8788e93e10670ac824..71cde0f5b27105c3ece994471017999b00794fa3 100644
1984+
index 9e68893b189ad05e4d2a5e8788e93e10670ac824..9d513b3a1a50e67284ee7ebdc5607e4f44bd0a4b 100644
19851985
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
19861986
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
19871987
@@ -14,34 +14,60 @@ import org.bukkit.entity.Player;
@@ -2073,7 +2073,7 @@ index 9e68893b189ad05e4d2a5e8788e93e10670ac824..71cde0f5b27105c3ece994471017999b
20732073
continue; // The line contents are still the same, skip.
20742074
}
20752075
- sign.setMessage(i, CraftChatMessage.fromString(line)[0]);
2076-
+ sign.messages[i] = io.papermc.paper.adventure.PaperAdventure.asVanilla(component);
2076+
+ sign.setMessage(i, io.papermc.paper.adventure.PaperAdventure.asVanilla(component));
20772077
}
20782078
+ // Paper end
20792079
}

patches/server/0826-Fix-tripwire-state-inconsistency.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ index 6b40bf94fbaa18605b59b92ad1582e8dc3a6a9cd..7d89b9ed84209c161b2c6fec5304abbb
4141
} else if (iblockdata1.is((Block) this)) {
4242
++k;
4343
diff --git a/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java b/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java
44-
index 02a3e1ced592784b9c66927c76376c7ab413367d..30b2497d9596c6d8e240d0231adaad7e4873ff7a 100644
44+
index 02a3e1ced592784b9c66927c76376c7ab413367d..277463eb0456ced1fe015d27b10505ec9e2a21ab 100644
4545
--- a/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java
4646
+++ b/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java
4747
@@ -107,6 +107,12 @@ public class TripWireHookBlock extends Block {
@@ -61,7 +61,7 @@ index 02a3e1ced592784b9c66927c76376c7ab413367d..30b2497d9596c6d8e240d0231adaad7e
6161
boolean flag7 = (Boolean) iblockdata2.getValue(TripWireBlock.POWERED);
6262

6363
flag5 |= flag6 && flag7;
64-
+ if (!tripWireBeingRemoved || (k == i && !flag6)) // Paper - don't update the tripwire again if being removed and not disarmed
64+
+ if (k != i || !tripWireBeingRemoved || !flag6)) // Paper - don't update the tripwire again if being removed and not disarmed
6565
aiblockdata[k] = iblockdata2;
6666
if (k == i) {
6767
world.scheduleTick(pos, (Block) this, 10);

0 commit comments

Comments
 (0)