From ebb6dffb310b9840e7f256ff7dba8903c1b12863 Mon Sep 17 00:00:00 2001 From: themode Date: Sat, 26 Feb 2022 00:38:27 +0100 Subject: [PATCH] Entities should not retrieve viewers from shared instances --- .../java/net/minestom/server/entity/EntityView.java | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/src/main/java/net/minestom/server/entity/EntityView.java b/src/main/java/net/minestom/server/entity/EntityView.java index 9d54f4d7e..8b22dc59e 100644 --- a/src/main/java/net/minestom/server/entity/EntityView.java +++ b/src/main/java/net/minestom/server/entity/EntityView.java @@ -7,8 +7,6 @@ import net.minestom.server.MinecraftServer; import net.minestom.server.coordinate.Point; import net.minestom.server.instance.EntityTracker; import net.minestom.server.instance.Instance; -import net.minestom.server.instance.InstanceContainer; -import net.minestom.server.instance.SharedInstance; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -223,19 +221,8 @@ final class EntityView { final Point point = trackedLocation.point(); Int2ObjectOpenHashMap entityMap = new Int2ObjectOpenHashMap<>(lastSize); - // Current Instance instance.getEntityTracker().nearbyEntities(point, RANGE, target, (entity) -> entityMap.putIfAbsent(entity.getEntityId(), entity)); - // Shared Instances - if (instance instanceof InstanceContainer container) { - final List shared = container.getSharedInstances(); - if (!shared.isEmpty()) { - for (var sharedInstance : shared) { - sharedInstance.getEntityTracker().nearbyEntities(point, RANGE, target, - (entity) -> entityMap.putIfAbsent(entity.getEntityId(), entity)); - } - } - } this.lastSize = entityMap.size(); return entityMap.values(); }