diff --git a/src/main/java/net/minestom/server/instance/Instance.java b/src/main/java/net/minestom/server/instance/Instance.java index f1c1cae2c..885f34a9e 100644 --- a/src/main/java/net/minestom/server/instance/Instance.java +++ b/src/main/java/net/minestom/server/instance/Instance.java @@ -444,7 +444,7 @@ public abstract class Instance implements Block.Getter, Block.Setter, */ public void setWorldAge(long worldAge) { this.worldAge = worldAge; - PacketUtils.sendGroupedPacket(getPlayers(), createTimePacket()); + PacketSendingUtils.sendGroupedPacket(getPlayers(), createTimePacket()); } /** diff --git a/src/test/java/net/minestom/server/network/packet/ClientPluginMessagePacketTest.java b/src/test/java/net/minestom/server/network/packet/ClientPluginMessagePacketTest.java index d017b4a42..e49e71669 100644 --- a/src/test/java/net/minestom/server/network/packet/ClientPluginMessagePacketTest.java +++ b/src/test/java/net/minestom/server/network/packet/ClientPluginMessagePacketTest.java @@ -4,8 +4,6 @@ import net.minestom.server.network.NetworkBuffer; import net.minestom.server.network.packet.client.common.ClientPluginMessagePacket; import org.junit.jupiter.api.Test; -import java.nio.ByteBuffer; - import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -13,14 +11,12 @@ public class ClientPluginMessagePacketTest { @Test void testClientPluginMessagePacket() { - ByteBuffer buf = ByteBuffer.allocateDirect(1024); // The default from NetworkBuffer - NetworkBuffer networkBuffer = new NetworkBuffer(buf); - ClientPluginMessagePacket clientPluginMessagePacket = new ClientPluginMessagePacket("channel", new byte[0]); + var array = NetworkBuffer.makeArray( + ClientPluginMessagePacket.SERIALIZER, + new ClientPluginMessagePacket("channel", new byte[0])); - clientPluginMessagePacket.write(networkBuffer); - buf.limit(networkBuffer.writeIndex()); // Must set limit so that RAW_BYTES in plugin message packet has a len. - - var packet = new ClientPluginMessagePacket(networkBuffer); + var readBuffer = NetworkBuffer.wrap(array, 0, array.length); + var packet = readBuffer.read(ClientPluginMessagePacket.SERIALIZER); assertEquals("channel", packet.channel()); assertArrayEquals(new byte[0], packet.data());