Kotori0629/Arclight1.18
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix hex chat color not parsed (#751)

Browse Source
This commit is contained in:
IzzelAliz 2022-10-04 10:49:43 +08:00
parent 201bb159d1
commit 1f312fa540
No known key found for this signature in database
GPG Key ID: EE50E123A11D8338
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/ServerPlayNetHandlerMixin.java
View File

@ -999,7 +999,9 @@ public abstract class ServerPlayNetHandlerMixin implements ServerPlayNetHandlerB
return null; return null;
} }
String message = String.format(queueEvent.getFormat(), queueEvent.getPlayer().getDisplayName(), queueEvent.getMessage()); String message = String.format(queueEvent.getFormat(), queueEvent.getPlayer().getDisplayName(), queueEvent.getMessage());
var event = ForgeHooks.onServerChatEvent(handler, queueEvent.getMessage(), ForgeHooks.newChatWithLinks(message), queueEvent.getMessage(), ForgeHooks.newChatWithLinks(message)); var chatWithLinks = CraftChatMessage.fromStringOrNull(message);
if (chatWithLinks == null) return null;
var event = ForgeHooks.onServerChatEvent(handler, queueEvent.getMessage(), ForgeHooks.newChatWithLinks(message), queueEvent.getMessage(), chatWithLinks);
var component = event == null ? null : event.getComponent(); var component = event == null ? null : event.getComponent();
if (component == null) return null; if (component == null) return null;
Bukkit.getConsoleSender().sendMessage(CraftChatMessage.fromComponent(component)); Bukkit.getConsoleSender().sendMessage(CraftChatMessage.fromComponent(component));
@ -1035,7 +1037,8 @@ public abstract class ServerPlayNetHandlerMixin implements ServerPlayNetHandlerB
return; return;
} }
s = String.format(event.getFormat(), event.getPlayer().getDisplayName(), event.getMessage()); s = String.format(event.getFormat(), event.getPlayer().getDisplayName(), event.getMessage());
Component chatWithLinks = ForgeHooks.newChatWithLinks(s); Component chatWithLinks = CraftChatMessage.fromStringOrNull(s);
if (chatWithLinks == null) return;
class ForgeChat extends Waitable<Void> { class ForgeChat extends Waitable<Void> {
@Override @Override