From 03323fecf6565a92f802c71d5aae0a120a9f5b39 Mon Sep 17 00:00:00 2001
From: JRoy <10731363+JRoy@users.noreply.github.com>
Date: Sat, 13 Jun 2026 21:09:39 -0700
Subject: [PATCH] Fix nickname format codes bleeding into following text

The single-arg legacyToMini() facet default flipped from false to true
during the Paper adventure migration (#6220), switching message
placeholder serialization from strict to non-strict. Non-strict output
leaves format tags open, so a formatted nickname/display name bleeds its
color and formatting into the rest of the message.

Restore the default to false and drop the now-redundant <reset> workaround
in SocialSpy local chat (#6507).

Fixes #6559
Fixes #6537
---
 .../com/earth2me/essentials/adventure/SpigotAdventureFacet.java | 2 +-
 .../essentials/chat/processing/AbstractChatHandler.java         | 2 +-
 .../com/earth2me/essentials/adventure/PaperAdventureFacet.java  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Essentials/src/main/java/com/earth2me/essentials/adventure/SpigotAdventureFacet.java b/Essentials/src/main/java/com/earth2me/essentials/adventure/SpigotAdventureFacet.java
index 1a15512d27d..96332b6b51a 100644
--- a/Essentials/src/main/java/com/earth2me/essentials/adventure/SpigotAdventureFacet.java
+++ b/Essentials/src/main/java/com/earth2me/essentials/adventure/SpigotAdventureFacet.java
@@ -76,7 +76,7 @@ public ComponentHolder deserializeMiniMessage(String message) {
 
     @Override
     public String legacyToMini(String message) {
-        return legacyToMini(message, true);
+        return legacyToMini(message, false);
     }
 
     @Override
diff --git a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AbstractChatHandler.java b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AbstractChatHandler.java
index 9737c511378..00903a631b6 100644
--- a/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AbstractChatHandler.java
+++ b/EssentialsChat/src/main/java/com/earth2me/essentials/chat/processing/AbstractChatHandler.java
@@ -225,7 +225,7 @@ protected void handleChatRecipients(AbstractChatEvent event) {
         if (!spyEvent.isCancelled()) {
             final String legacyString = ess.getAdventureFacet().miniToLegacy(
                     String.format(spyEvent.getFormat(),
-                            ess.getAdventureFacet().legacyToMini(user.getDisplayName()) + "<reset>",
+                            ess.getAdventureFacet().legacyToMini(user.getDisplayName()),
                             ess.getAdventureFacet().legacyToMiniWithUrls(ess.getAdventureFacet().escapeTags(spyEvent.getMessage()))));
 
             for (final Player onlinePlayer : spyEvent.getRecipients()) {
diff --git a/providers/PaperProvider/src/main/java/com/earth2me/essentials/adventure/PaperAdventureFacet.java b/providers/PaperProvider/src/main/java/com/earth2me/essentials/adventure/PaperAdventureFacet.java
index d5de801ce96..fcae0b0553d 100644
--- a/providers/PaperProvider/src/main/java/com/earth2me/essentials/adventure/PaperAdventureFacet.java
+++ b/providers/PaperProvider/src/main/java/com/earth2me/essentials/adventure/PaperAdventureFacet.java
@@ -76,7 +76,7 @@ public void send(Player player, ComponentHolder component) {
 
     @Override
     public String legacyToMini(String message) {
-        return legacyToMini(message, true);
+        return legacyToMini(message, false);
     }
 
     @Override