mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-11 01:12:47 +01:00
0708fa363b
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes:eb2e6578SPIGOT-5116: Fix concurrent modification exception inside ChunkMapDistance989f9b3dSPIGOT-4849: Fix server crash when accessing chunks during chunk load/unload/populate eventsf554183cSPIGOT-5171: Don't fire PlayerTeleportEvent if not actually moving2349feb8SPIGOT-5163: Cancelling PlayerBucketFillEvent visually removes the targeted block Spigot Changes: 9a643a6a Remove DataWatcher Locking
93 lines
4.1 KiB
Diff
93 lines
4.1 KiB
Diff
From c3dd6a91cd43ad998307d96d87eb158c79829423 Mon Sep 17 00:00:00 2001
|
|
From: Zach Brown <zach@zachbr.io>
|
|
Date: Tue, 23 Oct 2018 20:53:43 -0400
|
|
Subject: [PATCH] Strip private area unicode characters from signs
|
|
|
|
It is not immediately clear how these characters ended up on signs in
|
|
previous versions. It is clear, however, that they now render as empty
|
|
unicode boxes in 1.13, whereas previously they rendered as invisible
|
|
characters.
|
|
|
|
When these signs are loaded in versions after this commit, these
|
|
characters from the private use area of the Unicode block will be
|
|
stripped. The sign will then be marked to ensure this conversion only
|
|
runs once.
|
|
|
|
There is a flag -DPaper.keepInvalidUnicode=true that can be used if you
|
|
do not want us to strip these characters from your signs, though I can
|
|
think of no reason to use it.
|
|
|
|
Fixes GH-1571
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
|
|
index ddf8f4659..275b82b10 100644
|
|
--- a/src/main/java/net/minecraft/server/TileEntitySign.java
|
|
+++ b/src/main/java/net/minecraft/server/TileEntitySign.java
|
|
@@ -14,6 +14,11 @@ public class TileEntitySign extends TileEntity implements ICommandListener { //
|
|
private final String[] k = new String[4];
|
|
private EnumColor color;
|
|
|
|
+ // Paper start - Strip invalid unicode from signs on load
|
|
+ private static final boolean keepInvalidUnicode = Boolean.getBoolean("Paper.keepInvalidUnicode"); // Allow people to keep their bad unicode if they really want it
|
|
+ private boolean privateUnicodeRemoved = false;
|
|
+ // Paper end
|
|
+
|
|
public TileEntitySign() {
|
|
super(TileEntityTypes.SIGN);
|
|
this.color = EnumColor.BLACK;
|
|
@@ -36,6 +41,12 @@ public class TileEntitySign extends TileEntity implements ICommandListener { //
|
|
// CraftBukkit end
|
|
|
|
nbttagcompound.setString("Color", this.color.b());
|
|
+ // Paper start - Only remove private area unicode once // TODO - this doesn't need to run for every sign, check data ver
|
|
+ if (this.privateUnicodeRemoved) {
|
|
+ nbttagcompound.setBoolean("Paper.RemovedPrivateUnicode", true);
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
return nbttagcompound;
|
|
}
|
|
|
|
@@ -45,6 +56,11 @@ public class TileEntitySign extends TileEntity implements ICommandListener { //
|
|
super.load(nbttagcompound);
|
|
this.color = EnumColor.a(nbttagcompound.getString("Color"), EnumColor.BLACK);
|
|
|
|
+ // Paper start - Keep track, only do it once per sign
|
|
+ this.privateUnicodeRemoved = nbttagcompound.getBoolean("Paper.RemovedPrivateUnicode");
|
|
+ boolean ranUnicodeRemoval = false;
|
|
+ // Paper end
|
|
+
|
|
// CraftBukkit start - Add an option to convert signs correctly
|
|
// This is done with a flag instead of all the time because
|
|
// we have no way to tell whether a sign is from 1.7.10 or 1.8
|
|
@@ -57,6 +73,19 @@ public class TileEntitySign extends TileEntity implements ICommandListener { //
|
|
s = "\"\"";
|
|
}
|
|
|
|
+ // Paper start - Strip private use area unicode from signs
|
|
+ if (s != null && !keepInvalidUnicode && !this.privateUnicodeRemoved) {
|
|
+ StringBuilder builder = new StringBuilder();
|
|
+ for (char character : s.toCharArray()) {
|
|
+ if (Character.UnicodeBlock.of(character) != Character.UnicodeBlock.PRIVATE_USE_AREA) {
|
|
+ builder.append(character);
|
|
+ }
|
|
+ }
|
|
+ s = builder.toString();
|
|
+ ranUnicodeRemoval = true;
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
try {
|
|
//IChatBaseComponent ichatbasecomponent = IChatBaseComponent.ChatSerializer.a(s.isEmpty() ? "\"\"" : s); // Paper - move down - the old format might throw a json error
|
|
|
|
@@ -83,6 +112,7 @@ public class TileEntitySign extends TileEntity implements ICommandListener { //
|
|
this.k[i] = null;
|
|
}
|
|
|
|
+ if (ranUnicodeRemoval) this.privateUnicodeRemoved = true; // Paper - Flag to write NBT
|
|
}
|
|
|
|
public void a(int i, IChatBaseComponent ichatbasecomponent) {
|
|
--
|
|
2.22.0
|
|
|