Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-31 20:41:29 +01:00
Code Issues Projects Releases Wiki Activity

Fixed not auto viewable entity keeping viewers after being removed

Browse Source
This commit is contained in:
Felix Cravic 2020-07-24 22:48:38 +02:00
parent 1345968aac
commit d699343366
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/net/minestom/server/instance/Instance.java
View File

@ -657,11 +657,10 @@ public abstract class Instance implements BlockModifier, EventHandler, DataConta
RemoveEntityFromInstanceEvent event = new RemoveEntityFromInstanceEvent(this, entity); RemoveEntityFromInstanceEvent event = new RemoveEntityFromInstanceEvent(this, entity);
callCancellableEvent(RemoveEntityFromInstanceEvent.class, event, () -> { callCancellableEvent(RemoveEntityFromInstanceEvent.class, event, () -> {
if (entity.isAutoViewable()) { // Remove this entity from players viewable list and send delete entities packet
// Remove this entity from players viewable list and send delete entities packet entity.getViewers().forEach(p -> entity.removeViewer(p));
entity.getViewers().forEach(p -> entity.removeViewer(p));
}
// Remove the entity from cache
final Chunk chunk = getChunkAt(entity.getPosition()); final Chunk chunk = getChunkAt(entity.getPosition());
removeEntityFromChunk(entity, chunk); removeEntityFromChunk(entity, chunk);
}); });
@ -731,7 +730,7 @@ public abstract class Instance implements BlockModifier, EventHandler, DataConta
} }
private Set<Entity> getEntitiesInChunk(long index) { private Set<Entity> getEntitiesInChunk(long index) {
Set<Entity> entities = chunkEntities.getOrDefault(index, new CopyOnWriteArraySet<>()); final Set<Entity> entities = chunkEntities.getOrDefault(index, new CopyOnWriteArraySet<>());
return entities; return entities;
} }
@ -803,7 +802,7 @@ public abstract class Instance implements BlockModifier, EventHandler, DataConta
final ExplosionSupplier explosionSupplier = getExplosionSupplier(); final ExplosionSupplier explosionSupplier = getExplosionSupplier();
if (explosionSupplier == null) if (explosionSupplier == null)
throw new IllegalStateException("Tried to create an explosion with no explosion supplier"); throw new IllegalStateException("Tried to create an explosion with no explosion supplier");
Explosion explosion = explosionSupplier.createExplosion(centerX, centerY, centerZ, strength, additionalData); final Explosion explosion = explosionSupplier.createExplosion(centerX, centerY, centerZ, strength, additionalData);
explosion.apply(this); explosion.apply(this);
} }