From 7b954f57f20fd52287f3a01760ed0d3e5cd2cdac Mon Sep 17 00:00:00 2001
From: Emmanuel Lampe <mail@emmanuel-lampe.de>
Date: Tue, 2 Jul 2024 06:28:42 +0200
Subject: [PATCH] fix: don't override null custom messages to the event

---
 .../plugin/paper/event/EventMessageUtils.java | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/paper/src/main/java/de/rexlmanu/fairychat/plugin/paper/event/EventMessageUtils.java b/paper/src/main/java/de/rexlmanu/fairychat/plugin/paper/event/EventMessageUtils.java
index b4f6219..29baf2a 100644
--- a/paper/src/main/java/de/rexlmanu/fairychat/plugin/paper/event/EventMessageUtils.java
+++ b/paper/src/main/java/de/rexlmanu/fairychat/plugin/paper/event/EventMessageUtils.java
@@ -13,6 +13,7 @@
 import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.inventory.ItemStack;
 
+@SuppressWarnings("deprecation")
 @UtilityClass
 public class EventMessageUtils {
   public static Supplier<Component> quitMessage(PlayerQuitEvent event) {
@@ -28,11 +29,14 @@ public static Supplier<Component> quitMessage(PlayerQuitEvent event) {
 
   public static Consumer<Component> quitMessageSetter(PlayerQuitEvent event) {
     if (Environment.ENVIRONMENT.isPaper()) {
-      return event::quitMessage;
+      return component -> {
+        if (component != null) {
+          event.quitMessage(component);
+        }
+      };
     }
     return component -> {
       if (component == null) {
-        event.setQuitMessage(null);
         return;
       }
       event.setQuitMessage(LegacyComponentSerializer.legacySection().serialize(component));
@@ -52,11 +56,14 @@ public static Supplier<Component> joinMessage(PlayerJoinEvent event) {
 
   public static Consumer<Component> joinMessageSetter(PlayerJoinEvent event) {
     if (Environment.ENVIRONMENT.isPaper()) {
-      return event::joinMessage;
+      return component -> {
+        if (component != null) {
+          event.joinMessage(component);
+        }
+      };
     }
     return component -> {
       if (component == null) {
-        event.setJoinMessage(null);
         return;
       }
       event.setJoinMessage(LegacyComponentSerializer.legacySection().serialize(component));
@@ -76,11 +83,14 @@ public static Supplier<Component> deathMessage(PlayerDeathEvent event) {
 
   public static Consumer<Component> deathMessageSetter(PlayerDeathEvent event) {
     if (Environment.ENVIRONMENT.isPaper()) {
-      return event::deathMessage;
+      return component -> {
+        if (component != null) {
+          event.deathMessage(component);
+        }
+      };
     }
     return component -> {
       if (component == null) {
-        event.setDeathMessage(null);
         return;
       }
       event.setDeathMessage(LegacyComponentSerializer.legacySection().serialize(component));