Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-04 23:47:59 +01:00
Code Issues Projects Releases Wiki Activity

Use fastutil #fastIterable when possible

Browse Source
This commit is contained in:
TheMode 2021-08-17 20:37:15 +02:00
parent 4b59c9eaee
commit 9afb86a511
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,7 @@
package net.minestom.server.instance.batch; package net.minestom.server.instance.batch;
import it.unimi.dsi.fastutil.longs.Long2ObjectMap; import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
import it.unimi.dsi.fastutil.longs.Long2ObjectMaps;
import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap; import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
import net.minestom.server.instance.Chunk; import net.minestom.server.instance.Chunk;
import net.minestom.server.instance.Instance; import net.minestom.server.instance.Instance;
@ -124,24 +125,20 @@ public class AbsoluteBlockBatch implements Batch<Runnable> {
final AbsoluteBlockBatch inverse = this.options.shouldCalculateInverse() ? new AbsoluteBlockBatch(inverseOption) : null; final AbsoluteBlockBatch inverse = this.options.shouldCalculateInverse() ? new AbsoluteBlockBatch(inverseOption) : null;
synchronized (chunkBatchesMap) { synchronized (chunkBatchesMap) {
AtomicInteger counter = new AtomicInteger(); AtomicInteger counter = new AtomicInteger();
for (Long2ObjectMap.Entry<ChunkBatch> entry : chunkBatchesMap.long2ObjectEntrySet()) { for (var entry : Long2ObjectMaps.fastIterable(chunkBatchesMap)) {
final long chunkIndex = entry.getLongKey(); final long chunkIndex = entry.getLongKey();
final int chunkX = ChunkUtils.getChunkCoordX(chunkIndex); final int chunkX = ChunkUtils.getChunkCoordX(chunkIndex);
final int chunkZ = ChunkUtils.getChunkCoordZ(chunkIndex); final int chunkZ = ChunkUtils.getChunkCoordZ(chunkIndex);
final ChunkBatch batch = entry.getValue(); final ChunkBatch batch = entry.getValue();
ChunkBatch chunkInverse = batch.apply(instance, chunkX, chunkZ, c -> { ChunkBatch chunkInverse = batch.apply(instance, chunkX, chunkZ, c -> {
final boolean isLast = counter.incrementAndGet() == chunkBatchesMap.size(); final boolean isLast = counter.incrementAndGet() == chunkBatchesMap.size();
// Execute the callback if this was the last chunk to process // Execute the callback if this was the last chunk to process
if (isLast) { if (isLast) {
if (inverse != null) inverse.readyLatch.countDown(); if (inverse != null) inverse.readyLatch.countDown();
if (instance instanceof InstanceContainer) { if (instance instanceof InstanceContainer) {
// FIXME: put method in Instance instead // FIXME: put method in Instance instead
((InstanceContainer) instance).refreshLastBlockChangeTime(); ((InstanceContainer) instance).refreshLastBlockChangeTime();
} }
if (callback != null) { if (callback != null) {
if (safeCallback) { if (safeCallback) {
instance.scheduleNextTick(inst -> callback.run()); instance.scheduleNextTick(inst -> callback.run());
@ -151,9 +148,7 @@ public class AbsoluteBlockBatch implements Batch<Runnable> {
} }
} }
}); });
if (inverse != null) inverse.chunkBatchesMap.put(chunkIndex, chunkInverse);
if (inverse != null)
inverse.chunkBatchesMap.put(chunkIndex, chunkInverse);
} }
} }

4
src/main/java/net/minestom/server/utils/entity/EntityFinder.java
View File

@ -1,6 +1,6 @@
package net.minestom.server.utils.entity; package net.minestom.server.utils.entity;
import it.unimi.dsi.fastutil.objects.Object2BooleanMap; import it.unimi.dsi.fastutil.objects.Object2BooleanMaps;
import it.unimi.dsi.fastutil.objects.Object2BooleanOpenHashMap; import it.unimi.dsi.fastutil.objects.Object2BooleanOpenHashMap;
import net.minestom.server.MinecraftServer; import net.minestom.server.MinecraftServer;
import net.minestom.server.command.CommandSender; import net.minestom.server.command.CommandSender;
@ -358,7 +358,7 @@ public class EntityFinder {
} }
private static <T> boolean filterToggleableMap(@NotNull T value, @NotNull ToggleableMap<T> map) { private static <T> boolean filterToggleableMap(@NotNull T value, @NotNull ToggleableMap<T> map) {
for (Object2BooleanMap.Entry<T> entry : map.object2BooleanEntrySet()) { for (var entry : Object2BooleanMaps.fastIterable(map)) {
if (entry.getBooleanValue() != Objects.equals(value, entry.getKey())) { if (entry.getBooleanValue() != Objects.equals(value, entry.getKey())) {
return false; return false;
} }