Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-06-22 20:44:54 +02:00
Code Issues Projects Releases Wiki Activity

Add test for entity tracking registration

Browse Source
This commit is contained in:
themode 2021-12-23 01:33:34 +01:00 committed by TheMode
parent 18814f77e2
commit 91eb68661c
4 changed files with 62 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,6 +18,9 @@ import java.util.Set;
*/
@ApiStatus.Experimental
public sealed interface EntityTracker permits EntityTrackerImpl {
static @NotNull EntityTracker newTracker() {
return new EntityTrackerImpl();
}
/**
* Register an entity to be tracked.

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

@ -40,7 +40,10 @@ final class EntityTrackerImpl implements EntityTracker {
}
}
if (update != null) {
visibleEntities(point, target, update::add);
visibleEntities(point, target, newEntity -> {
if (newEntity == entity) return;
update.add(newEntity);
});
update.updateTracker(point, this);
}
}

2
src/main/java/net/minestom/server/utils/ViewEngine.java
View File

@ -98,8 +98,6 @@ public final class ViewEngine {
}
private void handleAutoView(Entity entity, Consumer<Entity> viewer, Consumer<Player> viewable) {
if (this.entity == entity)
return; // Ensure that self isn't added or removed as viewer
if (entity.getVehicle() != null)
return; // Passengers are handled by the vehicle, inheriting its viewing settings
if (this.entity instanceof Player && viewerOption.isAuto() && entity.isAutoViewable()) {

55
src/test/java/instance/EntityTrackerTest.java Normal file
View File

@ -0,0 +1,55 @@
package instance;
import net.minestom.server.coordinate.Point;
import net.minestom.server.coordinate.Vec;
import net.minestom.server.entity.Entity;
import net.minestom.server.entity.EntityType;
import net.minestom.server.instance.EntityTracker;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
public class EntityTrackerTest {
@Test
public void register() {
var ent1 = new Entity(EntityType.ZOMBIE);
var updated = new EntityTracker.Update<>() {
@Override
public void add(@NotNull Entity entity) {
assertNotSame(ent1, entity);
fail("No other entity should be registered yet");
}
@Override
public void remove(@NotNull Entity entity) {
assertNotSame(ent1, entity);
fail("No other entity should be registered yet");
}
@Override
public void updateTracker(@NotNull Point point, @Nullable EntityTracker tracker) {
// Empty
}
};
EntityTracker tracker = EntityTracker.newTracker();
var chunkEntities = tracker.chunkEntities(Vec.ZERO, EntityTracker.Target.ENTITIES);
assertTrue(chunkEntities.isEmpty());
tracker.register(ent1, Vec.ZERO, EntityTracker.Target.ENTITIES, updated);
assertTrue(chunkEntities.isEmpty());
chunkEntities = tracker.chunkEntities(Vec.ZERO, EntityTracker.Target.ENTITIES);
assertEquals(1, chunkEntities.size());
tracker.unregister(ent1, Vec.ZERO, EntityTracker.Target.ENTITIES, updated);
chunkEntities = tracker.chunkEntities(Vec.ZERO, EntityTracker.Target.ENTITIES);
assertEquals(0, chunkEntities.size());
}
@Test
public void move() {
}
}