From 239094971c9f78d68518ab4d60fea00ede312c1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elias=20M=C3=BCller?= Date: Sun, 2 Nov 2025 14:18:43 +0100 Subject: [PATCH] Revert "simplified event message handling logic in `ChatMessagesListener`" This reverts commit db13a9f0a2413df7178c5d5d27d78cfe5bde12ff. --- .../chatMessages/ChatMessagesListener.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/chatMessages/ChatMessagesListener.java b/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/chatMessages/ChatMessagesListener.java index 740ed52..561c5bf 100644 --- a/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/chatMessages/ChatMessagesListener.java +++ b/common/src/main/java/eu/mhsl/craftattack/spawn/common/appliances/metaGameplay/chatMessages/ChatMessagesListener.java @@ -21,17 +21,18 @@ class ChatMessagesListener extends ApplianceListener { public void onPlayerChatEvent(AsyncChatEvent event) { event.renderer( (source, sourceDisplayName, message, viewer) -> - Component.text() + Component.text("") .append(this.getAppliance().getReportablePlayerName(source)) .append(Component.text(" > ").color(TextColor.color(Color.GRAY.asRGB()))) .append(message).color(TextColor.color(Color.SILVER.asRGB())) - .build() ); } @EventHandler(priority = EventPriority.HIGH) public void onPlayerJoin(PlayerJoinEvent event) { - if(event.joinMessage() == null) return; + boolean wasHidden = event.joinMessage() == null; + event.joinMessage(null); + if(wasHidden) return; IteratorUtil.onlinePlayers(player -> { if(!Settings.instance().getSetting(player, Settings.Key.ShowJoinAndLeaveMessages, Boolean.class)) return; player.sendMessage( @@ -44,7 +45,9 @@ class ChatMessagesListener extends ApplianceListener { @EventHandler public void onPlayerLeave(PlayerQuitEvent event) { - if(event.quitMessage() == null) return; + boolean wasHidden = event.quitMessage() == null; + event.quitMessage(null); + if(wasHidden) return; IteratorUtil.onlinePlayers(player -> { if(!Settings.instance().getSetting(player, Settings.Key.ShowJoinAndLeaveMessages, Boolean.class)) return; player.sendMessage(