Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-02-12 18:42:07 +01:00
Code Issues Projects Releases Wiki Activity

Revert "Dont strip explicit leading color codes in chat components (#1512)"

Browse Source 
This reverts commit cd4848b2e6.

Fixes GH-1525
Reintroduces GH-1484
This commit is contained in:
Zach Brown 2018-10-03 18:15:22 -04:00
parent ec5b88b7c1
commit 8f9f852bb3
2 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Spigot-Server-Patches/Dont-strip-explicit-leading-color-codes-in-chat-comp.patch
View File

@ -1,20 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
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) {
--

2
Spigot-Server-Patches/Fix-FileIOThread-concurrency-issues.patch
View File

@ -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 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 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 --- a/src/main/java/net/minecraft/server/FileIOThread.java
+++ b/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; @@ -0,0 +0,0 @@ import org.apache.logging.log4j.Logger;