Fix

src/main/java/com/volmit/iris/gen/atomics/AtomicWorldData.java

@@ -8,6 +8,7 @@ import java.io.IOException;
 import com.volmit.iris.Iris;
 import com.volmit.iris.gen.scaffold.TerrainTarget;
 import com.volmit.iris.util.ChunkPosition;
+import com.volmit.iris.util.IrisLock;
 import com.volmit.iris.util.KList;
 import com.volmit.iris.util.KMap;
 import com.volmit.iris.util.M;
@@ -21,6 +22,7 @@ public class AtomicWorldData
 	private KMap<ChunkPosition, Long> lastChunk;
 	private KList<ChunkPosition> unloadRegions;
 	private KList<ChunkPosition> unloadChunks;
+	private IrisLock lock = new IrisLock("ULLock");
 	private long last = M.ms();
 
 	public AtomicWorldData(TerrainTarget world)
@@ -263,8 +265,10 @@ public class AtomicWorldData
 
 	public void clean(int j)
 	{
+		lock.lock();
 		if(M.ms() - last < getUnloadBatchSpeed())
 		{
+			lock.unlock();
 			return;
 		}
 
@@ -331,6 +335,7 @@ public class AtomicWorldData
 		}
 
 		unloadChunks.clear();
+		lock.unlock();
 	}
 
 	private int getUnloadBatchSize()

src/main/java/com/volmit/iris/gen/atomics/MasterLock.java

@@ -7,9 +7,11 @@ public class MasterLock
 {
 	private KMap<String, IrisLock> locks;
 	private IrisLock lock;
+	private boolean enabled;
 
 	public MasterLock()
 	{
+		enabled = true;
 		locks = new KMap<>();
 		lock = new IrisLock("MasterLock");
 	}
@@ -19,8 +21,18 @@ public class MasterLock
 		locks.clear();
 	}
 
+	public void disable()
+	{
+		enabled = false;
+	}
+
 	public void lock(String key)
 	{
+		if(!enabled)
+		{
+			return;
+		}
+
 		lock.lock();
 		if(!locks.containsKey(key))
 		{
@@ -34,6 +46,11 @@ public class MasterLock
 
 	public void unlock(String key)
 	{
+		if(!enabled)
+		{
+			return;
+		}
+		
 		lock.lock();
 		if(!locks.containsKey(key))
 		{