From 8f9f852bb33f97dc4702c8d81e128ecd40c54b31 Mon Sep 17 00:00:00 2001 From: Zach Brown <1254957+zachbr@users.noreply.github.com> Date: Wed, 3 Oct 2018 18:15:22 -0400 Subject: [PATCH] Revert "Dont strip explicit leading color codes in chat components (#1512)" This reverts commit cd4848b2e64850da7da2570f225ee0dd6e9def0c. Fixes GH-1525 Reintroduces GH-1484 --- ...cit-leading-color-codes-in-chat-comp.patch | 20 ------------------- .../Fix-FileIOThread-concurrency-issues.patch | 2 +- 2 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 Spigot-Server-Patches/Dont-strip-explicit-leading-color-codes-in-chat-comp.patch diff --git a/Spigot-Server-Patches/Dont-strip-explicit-leading-color-codes-in-chat-comp.patch b/Spigot-Server-Patches/Dont-strip-explicit-leading-color-codes-in-chat-comp.patch deleted file mode 100644 index 7854599d96..0000000000 --- a/Spigot-Server-Patches/Dont-strip-explicit-leading-color-codes-in-chat-comp.patch +++ /dev/null @@ -1,20 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: BillyGalbreath -Date: Sun, 30 Sep 2018 08:40:14 -0500 -Subject: [PATCH] Dont strip explicit leading color codes in chat components - - -diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java b/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java -index 5e20a9a61..df627d955 100644 ---- a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java -+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java -@@ -0,0 +0,0 @@ public final class CraftChatMessage { - } - out.append(c.getText()); - } -- return out.toString().replaceFirst("^(" + defaultColor + ")*", ""); -+ return out.toString().replaceFirst("^(" + defaultColor + ")", ""); // Paper - GH-1484 - } - - public static IChatBaseComponent fixComponent(IChatBaseComponent component) { --- \ No newline at end of file diff --git a/Spigot-Server-Patches/Fix-FileIOThread-concurrency-issues.patch b/Spigot-Server-Patches/Fix-FileIOThread-concurrency-issues.patch index 25bb167474..256a285a0f 100644 --- a/Spigot-Server-Patches/Fix-FileIOThread-concurrency-issues.patch +++ b/Spigot-Server-Patches/Fix-FileIOThread-concurrency-issues.patch @@ -9,7 +9,7 @@ issues when this counter is updated from multiple threads, potentially causing these counters to desync due to the unsafe volatile update diff --git a/src/main/java/net/minecraft/server/FileIOThread.java b/src/main/java/net/minecraft/server/FileIOThread.java -index 97917551..1959bc06 100644 +index 97917551a4..1959bc0660 100644 --- a/src/main/java/net/minecraft/server/FileIOThread.java +++ b/src/main/java/net/minecraft/server/FileIOThread.java @@ -0,0 +0,0 @@ import org.apache.logging.log4j.Logger;