From e323bc4a74ae60af9b15152939f283049b823feb Mon Sep 17 00:00:00 2001 From: chickeneer Date: Tue, 21 Dec 2021 11:48:51 -0600 Subject: [PATCH] Use legacyAmpersand method for componentserializer --- velocity/src/main/java/co/aikar/commands/ACFVelocityUtil.java | 3 +-- .../main/java/co/aikar/commands/VelocityMessageFormatter.java | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/velocity/src/main/java/co/aikar/commands/ACFVelocityUtil.java b/velocity/src/main/java/co/aikar/commands/ACFVelocityUtil.java index fa9d9ce8..f032d722 100644 --- a/velocity/src/main/java/co/aikar/commands/ACFVelocityUtil.java +++ b/velocity/src/main/java/co/aikar/commands/ACFVelocityUtil.java @@ -15,9 +15,8 @@ import java.util.stream.Collectors; public class ACFVelocityUtil { - @SuppressWarnings("deprecation") public static TextComponent color(String message) { - return LegacyComponentSerializer.legacy('&').deserialize(message); + return LegacyComponentSerializer.legacyAmpersand().deserialize(message); } public static Player findPlayerSmart(ProxyServer server, CommandIssuer issuer, String search) { diff --git a/velocity/src/main/java/co/aikar/commands/VelocityMessageFormatter.java b/velocity/src/main/java/co/aikar/commands/VelocityMessageFormatter.java index 04c60888..9e5e15ee 100644 --- a/velocity/src/main/java/co/aikar/commands/VelocityMessageFormatter.java +++ b/velocity/src/main/java/co/aikar/commands/VelocityMessageFormatter.java @@ -10,8 +10,7 @@ public class VelocityMessageFormatter extends MessageFormatter { } @Override - @SuppressWarnings("deprecation") String format(TextColor color, String message) { - return LegacyComponentSerializer.legacy('&').serialize(LegacyComponentSerializer.legacy('&').deserialize(message).color(color)); + return LegacyComponentSerializer.legacyAmpersand().serialize(LegacyComponentSerializer.legacy('&').deserialize(message).color(color)); } } \ No newline at end of file