From 6425ef6ecd61042335c5d5082dd1c2d7fdcf25d7 Mon Sep 17 00:00:00 2001
From: Ghzdude <44148655+ghzdude@users.noreply.github.com>
Date: Fri, 23 Feb 2024 19:25:51 -0700
Subject: [PATCH] Fix NPE when posting changes for storage busses (#405)

---
 src/main/java/appeng/fluids/parts/PartFluidStorageBus.java | 2 +-
 src/main/java/appeng/parts/misc/PartStorageBus.java        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/appeng/fluids/parts/PartFluidStorageBus.java b/src/main/java/appeng/fluids/parts/PartFluidStorageBus.java
index adaa26b0f..f6308ded4 100644
--- a/src/main/java/appeng/fluids/parts/PartFluidStorageBus.java
+++ b/src/main/java/appeng/fluids/parts/PartFluidStorageBus.java
@@ -551,7 +551,7 @@ public class PartFluidStorageBus extends PartUpgradeable implements IGridTickabl
      */
     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
index 55b8e8dda..c291648ee 100644
--- a/src/main/java/appeng/parts/misc/PartStorageBus.java
+++ b/src/main/java/appeng/parts/misc/PartStorageBus.java
@@ -585,7 +585,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
      */
     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)) {