Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-02-16 04:11:39 +01:00
Code Issues Projects Releases Wiki Activity

chore: rebase fixes

Browse Source
This commit is contained in:
mworzala 2024-10-22 22:20:04 -04:00 committed by Matt Worzala
parent 3f1841b669
commit 5df2328c02
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/minestom/server/instance/Instance.java
View File

@ -444,7 +444,7 @@ public abstract class Instance implements Block.Getter, Block.Setter,
*/ */
public void setWorldAge(long worldAge) { public void setWorldAge(long worldAge) {
this.worldAge = worldAge; this.worldAge = worldAge;
PacketUtils.sendGroupedPacket(getPlayers(), createTimePacket()); PacketSendingUtils.sendGroupedPacket(getPlayers(), createTimePacket());
} }
/** /**

14
src/test/java/net/minestom/server/network/packet/ClientPluginMessagePacketTest.java
View File

@ -4,8 +4,6 @@ import net.minestom.server.network.NetworkBuffer;
import net.minestom.server.network.packet.client.common.ClientPluginMessagePacket; import net.minestom.server.network.packet.client.common.ClientPluginMessagePacket;
import org.junit.jupiter.api.Test; 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.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
@ -13,14 +11,12 @@ public class ClientPluginMessagePacketTest {
@Test @Test
void testClientPluginMessagePacket() { void testClientPluginMessagePacket() {
ByteBuffer buf = ByteBuffer.allocateDirect(1024); // The default from NetworkBuffer var array = NetworkBuffer.makeArray(
NetworkBuffer networkBuffer = new NetworkBuffer(buf); ClientPluginMessagePacket.SERIALIZER,
ClientPluginMessagePacket clientPluginMessagePacket = new ClientPluginMessagePacket("channel", new byte[0]); new ClientPluginMessagePacket("channel", new byte[0]));
clientPluginMessagePacket.write(networkBuffer); var readBuffer = NetworkBuffer.wrap(array, 0, array.length);
buf.limit(networkBuffer.writeIndex()); // Must set limit so that RAW_BYTES in plugin message packet has a len. var packet = readBuffer.read(ClientPluginMessagePacket.SERIALIZER);
var packet = new ClientPluginMessagePacket(networkBuffer);
assertEquals("channel", packet.channel()); assertEquals("channel", packet.channel());
assertArrayEquals(new byte[0], packet.data()); assertArrayEquals(new byte[0], packet.data());