OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-28 15:30:19 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix filtered text not being applied on sign update

Browse source 
Fixes #7266
This commit is contained in:
Nassim Jahnke 2022-01-03 10:17:27 +01:00
parent eb98398158
commit 00d6cca4df
No known key found for this signature in database
GPG key ID: 6BE3B555EBC5982B
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
patches/server/0012-Adventure.patch
View file

@ -1981,7 +1981,7 @@ index 0beb96dc896f63003e1b1ae458b73902bdbe648a..102eb86bad3000f258775ac06ecd1a6d
public String getCustomName() { public String getCustomName() {
EnchantmentTableBlockEntity enchant = this.getSnapshot(); EnchantmentTableBlockEntity enchant = this.getSnapshot();
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
index 9e68893b189ad05e4d2a5e8788e93e10670ac824..71cde0f5b27105c3ece994471017999b00794fa3 100644 index 9e68893b189ad05e4d2a5e8788e93e10670ac824..9d513b3a1a50e67284ee7ebdc5607e4f44bd0a4b 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java --- a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
@@ -14,34 +14,60 @@ import org.bukkit.entity.Player; @@ -14,34 +14,60 @@ import org.bukkit.entity.Player;
@ -2073,7 +2073,7 @@ index 9e68893b189ad05e4d2a5e8788e93e10670ac824..71cde0f5b27105c3ece994471017999b
continue; // The line contents are still the same, skip. continue; // The line contents are still the same, skip.
} }
- sign.setMessage(i, CraftChatMessage.fromString(line)[0]); - 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 + // Paper end
} }

4
patches/server/0826-Fix-tripwire-state-inconsistency.patch
View file

@ -41,7 +41,7 @@ index 6b40bf94fbaa18605b59b92ad1582e8dc3a6a9cd..7d89b9ed84209c161b2c6fec5304abbb
} else if (iblockdata1.is((Block) this)) { } else if (iblockdata1.is((Block) this)) {
++k; ++k;
diff --git a/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java b/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java diff --git a/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java b/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java
index 02a3e1ced592784b9c66927c76376c7ab413367d..30b2497d9596c6d8e240d0231adaad7e4873ff7a 100644 index 02a3e1ced592784b9c66927c76376c7ab413367d..277463eb0456ced1fe015d27b10505ec9e2a21ab 100644
--- a/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java --- a/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java
+++ b/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java +++ b/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java
@@ -107,6 +107,12 @@ public class TripWireHookBlock extends Block { @@ -107,6 +107,12 @@ public class TripWireHookBlock extends Block {
@ -61,7 +61,7 @@ index 02a3e1ced592784b9c66927c76376c7ab413367d..30b2497d9596c6d8e240d0231adaad7e
boolean flag7 = (Boolean) iblockdata2.getValue(TripWireBlock.POWERED); boolean flag7 = (Boolean) iblockdata2.getValue(TripWireBlock.POWERED);
flag5 |= flag6 && flag7; 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; aiblockdata[k] = iblockdata2;
if (k == i) { if (k == i) {
world.scheduleTick(pos, (Block) this, 10); world.scheduleTick(pos, (Block) this, 10);