Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-28 02:51:42 +01:00
Code Issues Projects Releases Wiki Activity

Add nearby tracking test

Browse Source
This commit is contained in:
themode 2021-12-25 06:40:09 +01:00 committed by TheMode
parent c945faf367
commit c0fa6ef8ae
2 changed files with 52 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/net/minestom/server/instance/EntityTrackerImpl.java
View File

@ -153,7 +153,8 @@ final class EntityTrackerImpl implements EntityTracker {
ChunkUtils.forChunksInRange(point, chunkRange, (chunkX, chunkZ) -> {
var chunkEntities = chunkEntities(chunkX, chunkZ, target);
chunkEntities.forEach(entity -> {
if (point.distanceSquared(entity.getPosition()) < squaredRange) {
final Point position = entityPositions.get(entity.getEntityId());
if (point.distanceSquared(position) <= squaredRange) {
query.consume(entity);
}
});

50
src/test/java/instance/EntityTrackerTest.java
View File

@ -7,6 +7,9 @@ import net.minestom.server.instance.EntityTracker;
import org.jetbrains.annotations.NotNull;
import org.junit.jupiter.api.Test;
import java.util.HashSet;
import java.util.Set;
import static org.junit.jupiter.api.Assertions.*;
public class EntityTrackerTest {
@ -121,6 +124,53 @@ public class EntityTrackerTest {
});
}
@Test
public void nearby() {
var ent1 = new Entity(EntityType.ZOMBIE);
var ent2 = new Entity(EntityType.ZOMBIE);
var ent3 = new Entity(EntityType.ZOMBIE);
var updater = new EntityTracker.Update<>() {
@Override
public void add(@NotNull Entity entity) {
// Empty
}
@Override
public void remove(@NotNull Entity entity) {
// Empty
}
};
EntityTracker tracker = EntityTracker.newTracker();
tracker.register(ent2, new Vec(5, 0, 0), EntityTracker.Target.ENTITIES, updater);
tracker.register(ent3, new Vec(50, 0, 0), EntityTracker.Target.ENTITIES, updater);
tracker.nearbyEntities(Vec.ZERO, 4, EntityTracker.Target.ENTITIES, entity -> fail("No entity should be nearby"));
tracker.register(ent1, Vec.ZERO, EntityTracker.Target.ENTITIES, updater);
Set<Entity> entities = new HashSet<>();
entities.add(ent1);
tracker.nearbyEntities(Vec.ZERO, 4, EntityTracker.Target.ENTITIES, entity -> assertTrue(entities.remove(entity)));
assertEquals(0, entities.size());
entities.add(ent1);
tracker.nearbyEntities(Vec.ZERO, 4.99, EntityTracker.Target.ENTITIES, entity -> assertTrue(entities.remove(entity)));
assertEquals(0, entities.size());
entities.add(ent1);
entities.add(ent2);
tracker.nearbyEntities(Vec.ZERO, 5, EntityTracker.Target.ENTITIES, entity -> assertTrue(entities.remove(entity)));
assertEquals(0, entities.size());
entities.add(ent1);
entities.add(ent2);
entities.add(ent3);
tracker.nearbyEntities(Vec.ZERO, 50, EntityTracker.Target.ENTITIES, entity -> assertTrue(entities.remove(entity)));
assertEquals(0, entities.size());
}
@Test
public void collectionView() {
var ent1 = new Entity(EntityType.ZOMBIE);