Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-07 08:58:20 +01:00
Code Issues Projects Releases Wiki Activity

Fix JSON string not being displayable using ColoredText, remove unnecessary fields in PlayerListHeaderAndFooterPacket

Browse Source
This commit is contained in:
themode 2021-02-21 16:49:25 +01:00
parent 728107b0fe
commit 200b244224
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/net/minestom/server/chat/ColoredText.java
View File

@ -178,7 +178,6 @@ public class ColoredText extends JsonMessage {
String currentColor = "";
SpecialComponentContainer specialComponentContainer = new SpecialComponentContainer();
for (int i = 0; i < message.length(); i++) {
// Last char or null
final Character p = i == 0 ? null : message.charAt(i - 1);
@ -202,7 +201,7 @@ public class ColoredText extends JsonMessage {
continue;
inFormat = false;
formatStart = 0;
//formatStart = 0;
formatEnd = i;
// Color component
@ -270,13 +269,20 @@ public class ColoredText extends JsonMessage {
objects.add(getMessagePart(MessageType.KEYBIND, keybindCode, currentColor, specialComponentContainer));
continue;
}
// Was not a component, add the encapsulated string
final String current = message.substring(formatStart, i + 1);
objects.add(getMessagePart(MessageType.RAW, current, currentColor, specialComponentContainer));
}
}
// Add the remaining of the message as a raw message when any
if (formatEnd < message.length()) {
final String lastRawMessage = message.substring(formatEnd + 1);
objects.add(getMessagePart(MessageType.RAW, lastRawMessage, currentColor, specialComponentContainer));
// if 'objects' is empty, an empty message is required for the client to understand the final JSON
if (!lastRawMessage.isEmpty() || objects.isEmpty()) {
objects.add(getMessagePart(MessageType.RAW, lastRawMessage, currentColor, specialComponentContainer));
}
}
return objects;

2
src/main/java/net/minestom/server/entity/Player.java
View File

@ -937,8 +937,6 @@ public class Player extends LivingEntity implements CommandSender {
*/
public void sendHeaderFooter(@Nullable JsonMessage header, @Nullable JsonMessage footer) {
PlayerListHeaderAndFooterPacket playerListHeaderAndFooterPacket = new PlayerListHeaderAndFooterPacket();
playerListHeaderAndFooterPacket.emptyHeader = header == null;
playerListHeaderAndFooterPacket.emptyFooter = footer == null;
playerListHeaderAndFooterPacket.header = header;
playerListHeaderAndFooterPacket.footer = footer;

8
src/main/java/net/minestom/server/network/packet/server/play/PlayerListHeaderAndFooterPacket.java
View File

@ -10,22 +10,18 @@ public class PlayerListHeaderAndFooterPacket implements ServerPacket {
private static final String EMPTY_COMPONENT = "{\"translate\":\"\"}";
public boolean emptyHeader;
public boolean emptyFooter;
public JsonMessage header; // Only text
public JsonMessage footer; // Only text
@Override
public void write(@NotNull BinaryWriter writer) {
if (emptyHeader) {
if (header == null) {
writer.writeSizedString(EMPTY_COMPONENT);
} else {
writer.writeSizedString(header.toString());
}
if (emptyFooter) {
if (footer == null) {
writer.writeSizedString(EMPTY_COMPONENT);
} else {
writer.writeSizedString(footer.toString());