Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-09-29 06:57:28 +02:00
Code Issues Projects Releases Wiki Activity

Load a single chunk on instance spawn

Browse Source
This commit is contained in:
TheMode 2021-07-21 09:45:13 +02:00
parent bebdcf59d5
commit fceafb0b1e
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/net/minestom/server/entity/Player.java
View File

@ -541,11 +541,7 @@ public class Player extends LivingEntity implements CommandSender, Localizable,
if (dimensionChange) {
sendDimension(instanceDimensionType);
}
// Only load the spawning chunk to speed up login, remaining chunks are loaded in #spawnPlayer
final long[] visibleChunks = ChunkUtils.getChunksInRange(spawnPosition, 0);
return ChunkUtils.optionalLoadAll(instance, visibleChunks, null)
return instance.loadOptionalChunk(spawnPosition)
.thenRun(() -> spawnPlayer(instance, spawnPosition, firstSpawn, dimensionChange, true));
} else {
// The player already has the good version of all the chunks.
@ -1493,7 +1489,6 @@ public class Player extends LivingEntity implements CommandSender, Localizable,
public void refreshVisibleEntities(@NotNull Chunk newChunk) {
final int entityViewDistance = MinecraftServer.getEntityViewDistance();
final float maximalDistance = entityViewDistance * Chunk.CHUNK_SECTION_SIZE;
// Manage already viewable entities
this.viewableEntities.stream()
.filter(entity -> entity.getDistance(this) > maximalDistance)
@ -1506,18 +1501,15 @@ public class Player extends LivingEntity implements CommandSender, Localizable,
removeViewer((Player) entity);
}
});
// Manage entities in unchecked chunks
EntityUtils.forEachRange(instance, newChunk.toPosition(), entityViewDistance, entity -> {
if (entity.isAutoViewable() && !entity.viewers.contains(this)) {
entity.addViewer(this);
}
if (entity instanceof Player && isAutoViewable() && !viewers.contains(entity)) {
addViewer((Player) entity);
}
});
}
/**