Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-11-08 11:50:36 +01:00
Code Issues Projects Releases Wiki Activity

Misc cleanup

Browse Source
This commit is contained in:
themode 2022-02-24 23:29:41 +01:00
parent 842373da7d
commit f09dacf795
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,13 +15,11 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Function; import java.util.function.Function;
import java.util.function.Supplier;
import static net.minestom.server.utils.chunk.ChunkUtils.*; import static net.minestom.server.utils.chunk.ChunkUtils.*;
final class EntityTrackerImpl implements EntityTracker { final class EntityTrackerImpl implements EntityTracker {
static final AtomicInteger TARGET_COUNTER = new AtomicInteger(); static final AtomicInteger TARGET_COUNTER = new AtomicInteger();
private static final Supplier<List<Entity>> LIST_SUPPLIER = CopyOnWriteArrayList::new;
// Store all data associated to a Target // Store all data associated to a Target
// The array index is the Target enum ordinal // The array index is the Target enum ordinal
@ -120,7 +118,7 @@ final class EntityTrackerImpl implements EntityTracker {
public @Unmodifiable <T extends Entity> Collection<T> chunkEntities(int chunkX, int chunkZ, @NotNull Target<T> target) { public @Unmodifiable <T extends Entity> Collection<T> chunkEntities(int chunkX, int chunkZ, @NotNull Target<T> target) {
final TargetEntry<Entity> entry = entries[target.ordinal()]; final TargetEntry<Entity> entry = entries[target.ordinal()];
//noinspection unchecked //noinspection unchecked
var chunkEntities = (List<T>) entry.chunkEntities.computeIfAbsent(getChunkIndex(chunkX, chunkZ), i -> LIST_SUPPLIER.get()); var chunkEntities = (List<T>) entry.chunkEntities(getChunkIndex(chunkX, chunkZ));
return Collections.unmodifiableList(chunkEntities); return Collections.unmodifiableList(chunkEntities);
} }
@ -142,8 +140,7 @@ final class EntityTrackerImpl implements EntityTracker {
chunkIndex -> { chunkIndex -> {
final int count = getChunkCount(range); final int count = getChunkCount(range);
List<List<T>> entities = new ArrayList<>(count); List<List<T>> entities = new ArrayList<>(count);
forChunksInRange(chunkX, chunkZ, range, forChunksInRange(chunkX, chunkZ, range, (x, z) -> entities.add(entry.chunkEntities(getChunkIndex(x, z))));
(x, z) -> entities.add(entry.chunkEntities.computeIfAbsent(getChunkIndex(x, z), i -> (List<T>) LIST_SUPPLIER.get())));
assert entities.size() == count : "Expected " + count + " chunks, got " + entities.size(); assert entities.size() == count : "Expected " + count + " chunks, got " + entities.size();
return List.copyOf(entities); return List.copyOf(entities);
}); });
@ -183,8 +180,12 @@ final class EntityTrackerImpl implements EntityTracker {
this.target = target; this.target = target;
} }
List<T> chunkEntities(long index) {
return chunkEntities.computeIfAbsent(index, i -> (List<T>) new CopyOnWriteArrayList());
}
void addToChunk(long index, T entity) { void addToChunk(long index, T entity) {
this.chunkEntities.computeIfAbsent(index, i -> (List<T>) LIST_SUPPLIER.get()).add(entity); chunkEntities(index).add(entity);
} }
void removeFromChunk(long index, T entity) { void removeFromChunk(long index, T entity) {