Skip to content

draft: potential crash fixes #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AzureDoom merged 2 commits into from
Feb 19, 2026
Merged

draft: potential crash fixes #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
00eae5f
clean up attempt
KabanFriends Feb 9, 2026
4cfc5f8
small regression
KabanFriends Feb 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 44 additions & 46 deletions src/main/java/com/azuredoom/levelingcore/systems/level/MobLevelSystem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

import java.util.Locale;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicLong;

import com.azuredoom.levelingcore.LevelingCore;
Expand All @@ -37,12 +36,12 @@ public class MobLevelSystem extends EntityTickingSystem<EntityStore> {

private final ConcurrentLinkedQueue<PendingUpdate> pending = new ConcurrentLinkedQueue<>();

private final AtomicBoolean drainScheduled = new AtomicBoolean(false);

private static final int MAX_UPDATES_PER_DRAIN = 1000;

private final Config<GUIConfig> config;

private boolean drainScheduled = false;

public MobLevelSystem(Config<GUIConfig> config) {
this.config = config;
}
Expand Down Expand Up @@ -95,65 +94,64 @@ public void tick(

data.lastRecalcMs = nowMs;

pending.add(new PendingUpdate(npc, transform, store, data));
pending.add(new PendingUpdate(npc, transform, data));

if (drainScheduled.compareAndSet(false, true)) {
store.getExternalData().getWorld().execute(() -> drainPending(store));
if (!drainScheduled) {
drainScheduled = true;
drainPending(store);
}
}

private void drainPending(@NonNullDecl Store<EntityStore> store) {
store.getExternalData().getWorld().execute(() -> {
try {
var mobMaxLevel = computeMobMaxLevel();
try {
var mobMaxLevel = computeMobMaxLevel();

var processed = 0;
PendingUpdate u;
var processed = 0;
PendingUpdate u;

while (processed < MAX_UPDATES_PER_DRAIN && (u = pending.poll()) != null) {
var npc = u.npc();
var transform = u.transform();
var store1 = u.store();
var data = u.data();
while (processed < MAX_UPDATES_PER_DRAIN && (u = pending.poll()) != null) {
var npc = u.npc();
var transform = u.transform();
var data = u.data();

if (data.locked)
continue;
if (data.locked)
continue;

var newLevel = Math.max(
1,
Math.min(mobMaxLevel, MobLevelingUtil.computeDynamicLevel(config, npc, transform, store1))
);
var newLevel = Math.max(
1,
Math.min(mobMaxLevel, MobLevelingUtil.computeDynamicLevel(config, npc, transform, store))
);

if (newLevel != data.level) {
data.level = newLevel;
}
if (newLevel != data.level) {
data.level = newLevel;
}

if (!data.locked) {
data.level = Math.max(
1,
Math.min(
mobMaxLevel,
MobLevelingUtil.computeDynamicLevel(config, npc, transform, store1)
)
);
}
if (!data.locked) {
data.level = Math.max(
1,
Math.min(
mobMaxLevel,
MobLevelingUtil.computeDynamicLevel(config, npc, transform, store)
)
);
}

if (data.level != data.lastAppliedLevel) {
if (MobLevelingUtil.applyMobScaling(config, npc, data.level, store1)) {
data.lastAppliedLevel = data.level;
}
if (data.level != data.lastAppliedLevel) {
if (MobLevelingUtil.applyMobScaling(config, npc, data.level, store)) {
data.lastAppliedLevel = data.level;
}

processed++;
}
} finally {
drainScheduled.set(false);

if (!pending.isEmpty() && drainScheduled.compareAndSet(false, true)) {
store.getExternalData().getWorld().execute(() -> drainPending(store));
}
processed++;
}
} finally {
if (!pending.isEmpty()) {
drainScheduled = true;
drainPending(store);
} else {
drainScheduled = false;
}
});
}
}

private int computeMobMaxLevel() {
Expand Down
3 changes: 0 additions & 3 deletions src/main/java/com/azuredoom/levelingcore/utils/PendingUpdate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
package com.azuredoom.levelingcore.utils;

import com.hypixel.hytale.component.Store;
import com.hypixel.hytale.server.core.modules.entity.component.TransformComponent;
import com.hypixel.hytale.server.core.universe.world.storage.EntityStore;
import com.hypixel.hytale.server.npc.entities.NPCEntity;

import com.azuredoom.levelingcore.level.mobs.MobLevelData;

public record PendingUpdate(
NPCEntity npc,
TransformComponent transform,
Store<EntityStore> store,
MobLevelData data
) {}
Loading