2022-06-08 08:06:17 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: JRoy <joshroy126@gmail.com>
|
|
|
|
Date: Thu, 27 Aug 2020 16:57:25 -0400
|
|
|
|
Subject: [PATCH] Fix hex colors not working in some kick messages
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
|
2022-10-31 03:44:25 +01:00
|
|
|
index 34e4d00ede62be50808a2782e54da987cc62c9af..e12c67bdfa326b3f52f6a4973063cef44359b804 100644
|
2022-06-08 08:06:17 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/network/ServerHandshakePacketListenerImpl.java
|
2022-10-31 03:44:25 +01:00
|
|
|
@@ -76,12 +76,12 @@ public class ServerHandshakePacketListenerImpl implements ServerHandshakePacketL
|
2022-06-08 08:06:17 +02:00
|
|
|
}
|
|
|
|
// CraftBukkit end
|
|
|
|
if (packet.getProtocolVersion() != SharedConstants.getCurrentVersion().getProtocolVersion()) {
|
|
|
|
- MutableComponent ichatmutablecomponent;
|
|
|
|
+ Component ichatmutablecomponent; // Paper - Fix hex colors not working in some kick messages
|
|
|
|
|
|
|
|
if (packet.getProtocolVersion() < 754) {
|
|
|
|
- ichatmutablecomponent = Component.literal( java.text.MessageFormat.format( org.spigotmc.SpigotConfig.outdatedClientMessage.replaceAll("'", "''"), SharedConstants.getCurrentVersion().getName() ) ); // Spigot
|
|
|
|
+ ichatmutablecomponent = org.bukkit.craftbukkit.util.CraftChatMessage.fromString( java.text.MessageFormat.format( org.spigotmc.SpigotConfig.outdatedClientMessage.replaceAll("'", "''"), SharedConstants.getCurrentVersion().getName() ) , true )[0]; // Spigot // Paper - Fix hex colors not working in some kick messages
|
|
|
|
} else {
|
|
|
|
- ichatmutablecomponent = Component.literal( java.text.MessageFormat.format( org.spigotmc.SpigotConfig.outdatedServerMessage.replaceAll("'", "''"), SharedConstants.getCurrentVersion().getName() ) ); // Spigot
|
|
|
|
+ ichatmutablecomponent = org.bukkit.craftbukkit.util.CraftChatMessage.fromString( java.text.MessageFormat.format( org.spigotmc.SpigotConfig.outdatedServerMessage.replaceAll("'", "''"), SharedConstants.getCurrentVersion().getName() ) , true )[0]; // Spigot // Paper - Fix hex colors not working in some kick messages
|
|
|
|
}
|
|
|
|
|
|
|
|
this.connection.send(new ClientboundLoginDisconnectPacket(ichatmutablecomponent));
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
|
2022-12-19 11:46:55 +01:00
|
|
|
index 75a32d33518023cb24ba639751631bfad3563bd5..0869a7d6807815879aa9ded0d8b9baee82d535a9 100644
|
2022-06-08 08:06:17 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
|
2022-12-07 21:16:54 +01:00
|
|
|
@@ -102,7 +102,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
|
2022-06-08 08:06:17 +02:00
|
|
|
// CraftBukkit start
|
|
|
|
@Deprecated
|
|
|
|
public void disconnect(String s) {
|
|
|
|
- this.disconnect(Component.literal(s));
|
|
|
|
+ this.disconnect(org.bukkit.craftbukkit.util.CraftChatMessage.fromString(s, true)[0]); // Paper - Fix hex colors not working in some kick messages
|
|
|
|
}
|
|
|
|
// CraftBukkit end
|
|
|
|
|