From 2418662d14abac0e29c42494326b4e41f030767a Mon Sep 17 00:00:00 2001
From: Buuz135 <buuz135@hotmail.com>
Date: Fri, 29 Dec 2023 22:51:54 +0100
Subject: [PATCH] Fixed cascading loading issues, closes #243

---
 CHANGELOG.md                                                  | 4 ++++
 build.gradle                                                  | 2 +-
 .../block/tile/StorageControllerExtensionTile.java            | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 861ccd93..4093f225 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# VERSION 1.1.10
+* Fixed cascading loading issues, closes #243
+* Fixed Amethyst compacting dupe by Kanzaji
+
 # VERSION 1.1.9
 * Fixed ice compacting, closes #223
 
diff --git a/build.gradle b/build.gradle
index 379d9b85..bb908dd2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,7 +12,7 @@ buildscript {
 apply plugin: 'net.minecraftforge.gradle'
 
 group = 'com.buuz135'
-version = '1.19.2-1.1.9'
+version = '1.19.2-1.1.10'
 
 java {
     archivesBaseName = 'functionalstorage'
diff --git a/src/main/java/com/buuz135/functionalstorage/block/tile/StorageControllerExtensionTile.java b/src/main/java/com/buuz135/functionalstorage/block/tile/StorageControllerExtensionTile.java
index 3b6e82b8..fb98fed2 100644
--- a/src/main/java/com/buuz135/functionalstorage/block/tile/StorageControllerExtensionTile.java
+++ b/src/main/java/com/buuz135/functionalstorage/block/tile/StorageControllerExtensionTile.java
@@ -80,6 +80,7 @@ public <U> LazyOptional<U> getCapability(@Nonnull Capability<U> cap, @Nullable D
 
     private Optional<StorageControllerTile> getControllerInstance() {
         if (getControllerPos() == null) return Optional.empty();
+        if (level == null || !level.isLoaded(getControllerPos())) return Optional.empty();
         return TileUtil.getTileEntity(this.level, getControllerPos(), StorageControllerTile.class);
     }