Upstream/ViaFabric
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaFabric.git synced 2024-09-28 04:07:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix legacy text

Browse Source
This commit is contained in:
creeper123123321 2020-07-01 17:44:27 -03:00
parent c9b6313a72
commit bd70a8365b
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/com/github/creeper123123321/viafabric/platform/VRPlatform.java
View File

@ -57,9 +57,10 @@ import us.myles.ViaVersion.api.platform.TaskId;
import us.myles.ViaVersion.api.platform.ViaConnectionManager;
import us.myles.ViaVersion.api.platform.ViaPlatform;
import us.myles.ViaVersion.dump.PluginInfo;
import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.ChatRewriter;
import us.myles.ViaVersion.sponge.VersionInfo;
import us.myles.ViaVersion.util.GsonUtil;
import us.myles.viaversion.libs.bungeecordchat.api.chat.TextComponent;
import us.myles.viaversion.libs.bungeecordchat.chat.ComponentSerializer;
import us.myles.viaversion.libs.gson.JsonObject;
import java.io.File;
@ -231,7 +232,9 @@ public class VRPlatform implements ViaPlatform<UUID> {
runServerSync(() -> {
ServerPlayerEntity player = server.getPlayerManager().getPlayer(uuid);
if (player == null) return;
player.sendMessage(Text.Serializer.fromJson(ChatRewriter.legacyTextToJson(s)), false);
player.sendMessage(Text.Serializer.fromJson(
legacyToJson(s)
), false);
});
}
@ -241,7 +244,7 @@ public class VRPlatform implements ViaPlatform<UUID> {
if (handler != null) {
try {
handler.onGameMessage(new GameMessageS2CPacket(
Text.Serializer.fromJson(ChatRewriter.legacyTextToJson(s)), MessageType.SYSTEM, Util.NIL_UUID
Text.Serializer.fromJson(legacyToJson(s)), MessageType.SYSTEM, Util.NIL_UUID
));
} catch (OffThreadException ignored) {
}
@ -264,7 +267,7 @@ public class VRPlatform implements ViaPlatform<UUID> {
if (handler != null) {
try {
handler.onDisconnect(new DisconnectS2CPacket(
Text.Serializer.fromJson(ChatRewriter.legacyTextToJson(msg))
Text.Serializer.fromJson(legacyToJson(msg))
));
} catch (OffThreadException ignored) {
}
@ -279,7 +282,7 @@ public class VRPlatform implements ViaPlatform<UUID> {
Supplier<Boolean> kickTask = () -> {
ServerPlayerEntity player = server.getPlayerManager().getPlayer(uuid);
if (player == null) return false;
player.networkHandler.disconnect(Text.Serializer.fromJson(ChatRewriter.legacyTextToJson(s)));
player.networkHandler.disconnect(Text.Serializer.fromJson(legacyToJson(s)));
return true;
};
if (server.isOnThread()) {
@ -350,4 +353,8 @@ public class VRPlatform implements ViaPlatform<UUID> {
public ViaConnectionManager getConnectionManager() {
return connectionManager;
}
private String legacyToJson(String legacy) {
return ComponentSerializer.toString(TextComponent.fromLegacyText(legacy));
}
}