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

WIP singleTickMovementUpdate 

Signed-off-by: TheMode <themode@outlook.fr>
This commit is contained in:
TheMode 2022-04-05 03:08:34 +02:00
parent 740ffc8846
commit 5109acac42
2 changed files with 61 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/test/java/net/minestom/server/api/Collector.java
View File

@ -11,11 +11,6 @@ import static org.junit.jupiter.api.Assertions.assertInstanceOf;
public interface Collector<T> {
@NotNull List<@NotNull T> collect();
default void assertEmpty() {
List<T> elements = collect();
assertEquals(0, elements.size(), "Expected 0 element, got " + elements);
}
default <P extends T> void assertSingle(@NotNull Class<P> type, @NotNull Consumer<P> consumer) {
List<T> elements = collect();
assertEquals(1, elements.size(), "Expected 1 element, got " + elements);
@ -29,4 +24,17 @@ public interface Collector<T> {
assertEquals(1, elements.size(), "Expected 1 element, got " + elements);
consumer.accept(elements.get(0));
}
default void assertCount(int count) {
List<T> elements = collect();
assertEquals(count, elements.size(), "Expected " + count + " element(s), got " + elements);
}
default void assertSingle() {
assertCount(1);
}
default void assertEmpty() {
assertCount(0);
}
}

48
src/test/java/net/minestom/server/entity/player/PlayerMovementIntegrationTest.java Normal file
View File

@ -0,0 +1,48 @@
package net.minestom.server.entity.player;
import net.minestom.server.api.Env;
import net.minestom.server.api.EnvTest;
import net.minestom.server.coordinate.Pos;
import net.minestom.server.network.packet.client.play.ClientPlayerPositionPacket;
import net.minestom.server.network.packet.client.play.ClientTeleportConfirmPacket;
import net.minestom.server.network.packet.server.play.EntityPositionPacket;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@EnvTest
public class PlayerMovementIntegrationTest {
@Test
public void teleportConfirm(Env env) {
var instance = env.createFlatInstance();
var p1 = env.createPlayer(instance, new Pos(0, 40, 0));
// No confirmation
p1.addPacketToQueue(new ClientPlayerPositionPacket(new Pos(0.2, 40, 0), true));
p1.interpretPacketQueue();
assertEquals(new Pos(0, 40, 0), p1.getPosition());
// Confirmation
p1.addPacketToQueue(new ClientTeleportConfirmPacket(p1.getLastSentTeleportId()));
p1.addPacketToQueue(new ClientPlayerPositionPacket(new Pos(0.2, 40, 0), true));
p1.interpretPacketQueue();
assertEquals(new Pos(0.2, 40, 0), p1.getPosition());
}
// FIXME
//@Test
public void singleTickMovementUpdate(Env env) {
var instance = env.createFlatInstance();
var connection = env.createConnection();
var p1 = env.createPlayer(instance, new Pos(0, 40, 0));
connection.connect(instance, new Pos(0, 40, 0)).join();
p1.addPacketToQueue(new ClientTeleportConfirmPacket(p1.getLastSentTeleportId()));
p1.addPacketToQueue(new ClientPlayerPositionPacket(new Pos(0.2, 40, 0), true));
p1.addPacketToQueue(new ClientPlayerPositionPacket(new Pos(0.4, 40, 0), true));
var tracker = connection.trackIncoming(EntityPositionPacket.class);
p1.interpretPacketQueue();
// Position update should only be sent once per tick independently of the number of packets
tracker.assertSingle();
}
}