Fix NPE when posting changes for storage busses (#405)

AE2-UEL · Feb 24, 2024 · 6425ef6 · 6425ef6
1 parent 7ebb2a0
commit 6425ef6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main/java/appeng/fluids/parts/PartFluidStorageBus.java b/src/main/java/appeng/fluids/parts/PartFluidStorageBus.java
@@ -551,7 +551,7 @@ public GuiBridge getGuiBridge() {
      */
     protected Iterable<IAEFluidStack> filterChanges(Iterable<IAEFluidStack> change) {
         var storageFilter = this.getConfigManager().getSetting(Settings.STORAGE_FILTER);
-        if (storageFilter == StorageFilter.EXTRACTABLE_ONLY) {
+        if (storageFilter == StorageFilter.EXTRACTABLE_ONLY && handler != null) {
             var filteredList = new ArrayList<IAEFluidStack>();
             for (final IAEFluidStack stack : change) {
                 if (this.handler.passesBlackOrWhitelist(stack)) {

diff --git a/src/main/java/appeng/parts/misc/PartStorageBus.java b/src/main/java/appeng/parts/misc/PartStorageBus.java
@@ -585,7 +585,7 @@ public GuiBridge getGuiBridge() {
      */
     protected Iterable<IAEItemStack> filterChanges(Iterable<IAEItemStack> change) {
         var storageFilter = this.getConfigManager().getSetting(Settings.STORAGE_FILTER);
-        if (storageFilter == StorageFilter.EXTRACTABLE_ONLY) {
+        if (storageFilter == StorageFilter.EXTRACTABLE_ONLY && handler != null) {
             var filteredList = new ArrayList<IAEItemStack>();
             for (final IAEItemStack stack : change) {
                 if (this.handler.passesBlackOrWhitelist(stack)) {