nachonekoawa/Lophine
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: fix an async bug

Browse Source 
if latest task is not done, skip this tick so that we can not block thread and run the task have not done, after it done, the new data will be processed in the next tick
This commit is contained in:
Helvetica Volubi
2025-12-03 20:27:50 +08:00
parent 5c4031b836
commit 96c99519d5
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lophine-server/src/main/java/fun/bm/lophine/utils/EntitiesCounterUtil.java
+11 -3
View File
@@ -37,7 +37,8 @@ public class EntitiesCounterUtil {
}
public static boolean canRunNewTask(ServerLevel level) {
return tasks.get(level).isDone();
CompletableFuture<Void> task = tasks.get(level);
return task == null || task.isDone();
}
public static void tick(ServerLevel level) {
@@ -55,8 +56,8 @@ public class EntitiesCounterUtil {
entity.spawnReason == CreatureSpawnEvent.SpawnReason.CHUNK_GEN)) {
continue;
}
map.addTo(category, 1);
// Paper end - Only count natural spawns
map.addTo(category, 1);
}
// Lophine start - Copy from net/minecraft/world/level/NaturalSpawner
}
@@ -74,10 +75,17 @@ public class EntitiesCounterUtil {
ServerLevel level, int spawnableChunkCount, Iterable<Entity> entities, NaturalSpawner.ChunkGetter chunkGetter, LocalMobCapCalculator calculator, final boolean countMobs
) {
// Lophine start - Copy from net/minecraft/world/level/NaturalSpawner
Object2IntOpenHashMap<MobCategory> map = mobsMap.get(level);
Object2IntOpenHashMap<MobCategory> map = getMobsMap(level);
if (map == null) return null; // skip if no data
PotentialCalculator potentialCalculator = new PotentialCalculator();
for (Entity entity : entities) {
// Paper start - Only count natural spawns
if (!entity.level().paperConfig().entities.spawning.countAllMobsForSpawning &&
!(entity.spawnReason == CreatureSpawnEvent.SpawnReason.NATURAL ||
entity.spawnReason == CreatureSpawnEvent.SpawnReason.CHUNK_GEN)) {
continue;
}
// Paper end - Only count natural spawns
BlockPos blockPos = entity.blockPosition();
chunkGetter.query(ChunkPos.asLong(blockPos), chunk -> {
MobSpawnSettings.MobSpawnCost mobSpawnCost = getRoughBiome(blockPos, chunk).getMobSettings().getMobSpawnCost(entity.getType());