Upstream
/
Minestom
mirror of https://github.com/Minestom/Minestom.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix player sendMessage methods

This commit is contained in:
Draycia 2020-05-03 05:17:32 -07:00
parent 5437fa90cc
commit ad4193d934
3 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/net/minestom/server/chat/Chat.java
View File

@ -25,11 +25,11 @@ public class Chat {
return LegacyComponentSerializer.legacyLinking().serialize(component);
}
public static TextComponent toLegacyText(String text, char colorChar) {
public static TextComponent fromLegacyText(String text, char colorChar) {
return LegacyComponentSerializer.legacyLinking().deserialize(text, colorChar);
}
public static TextComponent toLegacyText(String text) {
return toLegacyText(text, COLOR_CHAR);
public static TextComponent fromLegacyText(String text) {
return fromLegacyText(text, COLOR_CHAR);
}
}

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

@ -1,6 +1,5 @@
package net.minestom.server.entity;
import com.google.gson.JsonObject;
import net.kyori.text.TextComponent;
import net.minestom.server.MinecraftServer;
import net.minestom.server.bossbar.BossBar;
@ -398,20 +397,19 @@ public class Player extends LivingEntity {
// Use legacy color formatting
public void sendMessage(String message) {
sendMessage(Chat.toLegacyText(message));
sendMessage(Chat.fromLegacyText(message));
}
public void sendMessage(String message, char colorChar) {
sendMessage(Chat.toLegacyText(message, colorChar));
}
public void sendMessage(JsonObject jsonObject) {
ChatMessagePacket chatMessagePacket = new ChatMessagePacket(jsonObject.toString(), ChatMessagePacket.Position.CHAT);
playerConnection.sendPacket(chatMessagePacket);
sendMessage(Chat.fromLegacyText(message, colorChar));
}
public void sendMessage(TextComponent textObject) {
sendMessage(Chat.toJsonString(textObject));
sendMessageJson(Chat.toJsonString(textObject));
}
private void sendMessageJson(String json) {
playerConnection.sendPacket(new ChatMessagePacket(json, ChatMessagePacket.Position.CHAT));
}
public void playSound(Sound sound, SoundCategory soundCategory, int x, int y, int z, float volume, float pitch) {
@ -456,8 +454,8 @@ public class Player extends LivingEntity {
playerListHeaderAndFooterPacket.emptyHeader = header == null;
playerListHeaderAndFooterPacket.emptyFooter = footer == null;
playerListHeaderAndFooterPacket.header = Chat.toJsonString(Chat.toLegacyText(header, colorChar));
playerListHeaderAndFooterPacket.footer = Chat.toJsonString(Chat.toLegacyText(footer, colorChar));
playerListHeaderAndFooterPacket.header = Chat.toJsonString(Chat.fromLegacyText(header, colorChar));
playerListHeaderAndFooterPacket.footer = Chat.toJsonString(Chat.fromLegacyText(footer, colorChar));
playerConnection.sendPacket(playerListHeaderAndFooterPacket);
}
@ -465,7 +463,7 @@ public class Player extends LivingEntity {
public void sendActionBarMessage(String message, char colorChar) {
TitlePacket titlePacket = new TitlePacket();
titlePacket.action = TitlePacket.Action.SET_ACTION_BAR;
titlePacket.actionBarText = Chat.toJsonString(Chat.toLegacyText(message, colorChar));
titlePacket.actionBarText = Chat.toJsonString(Chat.fromLegacyText(message, colorChar));
playerConnection.sendPacket(titlePacket);
}

2
src/main/java/net/minestom/server/listener/ChatMessageListener.java
View File

@ -18,7 +18,7 @@ import java.util.function.Function;
public class ChatMessageListener {
public static void listener(ClientChatMessagePacket packet, Player player) {
String message = PlainComponentSerializer.INSTANCE.serialize(Chat.toLegacyText(packet.message));
String message = PlainComponentSerializer.INSTANCE.serialize(Chat.fromLegacyText(packet.message));
CommandManager commandManager = MinecraftServer.getCommandManager();
String cmdPrefix = commandManager.getCommandPrefix();