Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-24 17:11:58 +01:00
Code Issues Projects Releases Wiki Activity

Entities should not retrieve viewers from shared instances

Browse Source
This commit is contained in:
themode 2022-02-26 00:38:27 +01:00
parent 50c0f01fb2
commit ebb6dffb31
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/net/minestom/server/entity/EntityView.java
View File

@ -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<T> 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<SharedInstance> 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();
}