diff --git a/core/src/main/java/com/volmit/iris/core/service/IrisEngineSVC.java b/core/src/main/java/com/volmit/iris/core/service/IrisEngineSVC.java index 0c8c60c5e..d0187e6f4 100644 --- a/core/src/main/java/com/volmit/iris/core/service/IrisEngineSVC.java +++ b/core/src/main/java/com/volmit/iris/core/service/IrisEngineSVC.java @@ -100,13 +100,7 @@ public class IrisEngineSVC implements IrisService { Engine engine = supplier.get(); if (engine != null) { long unloadStart = System.currentTimeMillis(); - int count = 0; - if (!lastUse.isEmpty()){ - count = engine.getMantle().unloadTectonicPlate(tectonicLimit.get() / lastUse.size()); - } else { - count = engine.getMantle().unloadTectonicPlate(tectonicLimit.get()); - } - + int count = engine.getMantle().unloadTectonicPlate(); if (count > 0) { Iris.debug(C.GOLD + "Unloaded " + C.YELLOW + count + " TectonicPlates in " + C.RED + Form.duration(System.currentTimeMillis() - unloadStart, 2)); } diff --git a/core/src/main/java/com/volmit/iris/engine/mantle/EngineMantle.java b/core/src/main/java/com/volmit/iris/engine/mantle/EngineMantle.java index c8326ffd0..fe17b0655 100644 --- a/core/src/main/java/com/volmit/iris/engine/mantle/EngineMantle.java +++ b/core/src/main/java/com/volmit/iris/engine/mantle/EngineMantle.java @@ -178,8 +178,8 @@ public interface EngineMantle extends IObjectPlacer { default void trim(int limit) { getMantle().trim(TimeUnit.SECONDS.toMillis(IrisSettings.get().getPerformance().getMantleKeepAlive()), limit); } - default int unloadTectonicPlate(int tectonicLimit){ - return getMantle().unloadTectonicPlate(tectonicLimit); + default int unloadTectonicPlate(){ + return getMantle().unloadTectonicPlate(); } default MultiBurst burst() { 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 0634d488a..56a2a2189 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 @@ -444,11 +444,7 @@ public class Mantle { } } - public int unloadTectonicPlate(int tectonicLimit) { - // todo: make a advanced unloader - if (toUnload.size() > tectonicLimit / lastUse.size()){ - dynamicThreads.set(2); - } + public int unloadTectonicPlate() { AtomicInteger i = new AtomicInteger(); unloadLock.lock(); try {