From 156c6a31df0d0ed3a9f087dc4b5251dc6fc50cbb Mon Sep 17 00:00:00 2001 From: Kezz <1526243+kezz@users.noreply.github.com> Date: Sat, 27 Mar 2021 15:52:35 +0000 Subject: [PATCH] Write scoreboard objects using standard JSON serialization (#196) --- .../server/play/ScoreboardObjectivePacket.java | 2 +- .../minestom/server/utils/binary/BinaryWriter.java | 13 ------------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/src/main/java/net/minestom/server/network/packet/server/play/ScoreboardObjectivePacket.java b/src/main/java/net/minestom/server/network/packet/server/play/ScoreboardObjectivePacket.java index 3671b8503..ac8bd077d 100644 --- a/src/main/java/net/minestom/server/network/packet/server/play/ScoreboardObjectivePacket.java +++ b/src/main/java/net/minestom/server/network/packet/server/play/ScoreboardObjectivePacket.java @@ -38,7 +38,7 @@ public class ScoreboardObjectivePacket implements ComponentHoldingServerPacket { writer.writeByte(mode); if (mode == 0 || mode == 2) { - writer.writeComponentAsLegacy(objectiveValue); + writer.writeComponent(objectiveValue); writer.writeVarInt(type.ordinal()); } } diff --git a/src/main/java/net/minestom/server/utils/binary/BinaryWriter.java b/src/main/java/net/minestom/server/utils/binary/BinaryWriter.java index b73adc2cb..08e1400f2 100644 --- a/src/main/java/net/minestom/server/utils/binary/BinaryWriter.java +++ b/src/main/java/net/minestom/server/utils/binary/BinaryWriter.java @@ -3,7 +3,6 @@ package net.minestom.server.utils.binary; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import net.kyori.adventure.text.Component; -import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; import net.minestom.server.MinecraftServer; import net.minestom.server.adventure.AdventureSerializer; import net.minestom.server.item.ItemStack; @@ -18,7 +17,6 @@ import org.jglrxavpok.hephaistos.nbt.NBTWriter; import java.io.IOException; import java.io.OutputStream; import java.nio.charset.StandardCharsets; -import java.util.Objects; import java.util.UUID; import java.util.function.Consumer; @@ -74,17 +72,6 @@ public class BinaryWriter extends OutputStream { this.writeSizedString(AdventureSerializer.serialize(component)); } - /** - * Writes a component to the buffer as a sized string. This method uses - * {@link LegacyComponentSerializer} to convert the component into a string - * containing the legacy section signs. - * - * @param component the component - */ - public void writeComponentAsLegacy(@NotNull Component component) { - this.writeSizedString(LegacyComponentSerializer.legacySection().serialize(component)); - } - /** * Writes a single boolean to the buffer. *