From ffa0b984a0e99a86db9f95ae3154364ebb32bfdb Mon Sep 17 00:00:00 2001 From: RePixelatedMC Date: Wed, 10 Jan 2024 18:47:14 +0100 Subject: [PATCH] whoop --- .../com/volmit/iris/util/mantle/Mantle.java | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/core/src/main/java/com/volmit/iris/util/mantle/Mantle.java b/core/src/main/java/com/volmit/iris/util/mantle/Mantle.java index 7457b9f1c..ad54ebfaa 100644 --- a/core/src/main/java/com/volmit/iris/util/mantle/Mantle.java +++ b/core/src/main/java/com/volmit/iris/util/mantle/Mantle.java @@ -421,22 +421,27 @@ public class Mantle { } ioTrim.set(true); - //unloadLock.lock(); + unloadLock.lock(); try { Iris.debug("Trimming Tectonic Plates older than " + Form.duration(adjustedIdleDuration.get(), 0)); if (lastUse != null) { - for (Long i : new ArrayList<>(lastUse.keySet())) { - double finalAdjustedIdleDuration = adjustedIdleDuration.get(); - hyperLock.withLong(i, () -> { - Long lastUseTime = lastUse.get(i); - if (lastUseTime != null && M.ms() - lastUseTime >= finalAdjustedIdleDuration) { - toUnload.add(i); - Iris.debug("Tectonic Region added to unload"); - } - }); + if (!lastUse.isEmpty()) { + for (Long i : new ArrayList<>(lastUse.keySet())) { + double finalAdjustedIdleDuration = adjustedIdleDuration.get(); + hyperLock.withLong(i, () -> { + Long lastUseTime = lastUse.get(i); + if (lastUseTime != null && M.ms() - lastUseTime >= finalAdjustedIdleDuration) { + toUnload.add(i); + Iris.debug("Tectonic Region added to unload"); + Iris.panic(); + } + }); + } } } + } catch (Throwable e) { + Iris.reportError(e); } finally { ioTrim.set(false); unloadLock.unlock();