diff --git a/core/src/main/java/com/volmit/iris/core/tools/IrisToolbelt.java b/core/src/main/java/com/volmit/iris/core/tools/IrisToolbelt.java index 06651213c..a28b7c964 100644 --- a/core/src/main/java/com/volmit/iris/core/tools/IrisToolbelt.java +++ b/core/src/main/java/com/volmit/iris/core/tools/IrisToolbelt.java @@ -34,6 +34,7 @@ import com.volmit.iris.util.plugin.VolmitSender; import org.bukkit.Bukkit; import org.bukkit.World; import org.bukkit.entity.Player; +import org.jetbrains.annotations.ApiStatus; import java.io.File; import java.io.IOException; @@ -45,6 +46,7 @@ import java.util.Map; * Hope you packed snacks & road sodas. */ public class IrisToolbelt { + @ApiStatus.Internal public static Map toolbeltConfiguration = new HashMap<>(); /** @@ -235,6 +237,10 @@ public class IrisToolbelt { toolbeltConfiguration.put("retain.mantle." + className, true); } + public static boolean isRetainingMantleDataForSlice(String className) { + return !toolbeltConfiguration.isEmpty() && toolbeltConfiguration.get("retain.mantle." + className) == Boolean.TRUE; + } + public static T getMantleData(World world, int x, int y, int z, Class of) { PlatformChunkGenerator e = access(world); if (e == null) { 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 38c1549a8..902206a2e 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 @@ -623,7 +623,7 @@ public class Mantle { } public void deleteChunkSlice(int x, int z, Class c) { - if (!IrisToolbelt.toolbeltConfiguration.isEmpty() && IrisToolbelt.toolbeltConfiguration.getOrDefault("retain.mantle." + c.getCanonicalName(), false)) { + if (IrisToolbelt.isRetainingMantleDataForSlice(c.getCanonicalName())) { return; } diff --git a/core/src/main/java/com/volmit/iris/util/mantle/MantleChunk.java b/core/src/main/java/com/volmit/iris/util/mantle/MantleChunk.java index bb6ed868e..297140c5d 100644 --- a/core/src/main/java/com/volmit/iris/util/mantle/MantleChunk.java +++ b/core/src/main/java/com/volmit/iris/util/mantle/MantleChunk.java @@ -19,6 +19,7 @@ package com.volmit.iris.util.mantle; import com.volmit.iris.Iris; +import com.volmit.iris.core.tools.IrisToolbelt; import com.volmit.iris.util.documentation.ChunkCoordinates; import com.volmit.iris.util.documentation.ChunkRelativeBlockCoordinates; import com.volmit.iris.util.function.Consumer4; @@ -270,6 +271,8 @@ public class MantleChunk extends FlaggedChunk { } public void deleteSlices(Class c) { + if (IrisToolbelt.isRetainingMantleDataForSlice(c.getCanonicalName())) + return; for (int i = 0; i < sections.length(); i++) { Matter m = sections.get(i); if (m != null && m.hasSlice(c)) {