From 71c944daea4f2aa1c86d5273cf2a58c4e4d62783 Mon Sep 17 00:00:00 2001
From: PrototypeTrousers <salomaoo@gmail.com>
Date: Wed, 4 Aug 2021 20:47:44 -0300
Subject: [PATCH] fix fluid storagebus NPE crash

---
 gradle.properties                             |  2 +-
 .../fluids/parts/PartFluidStorageBus.java     | 21 ++++++++++++-------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 71564ca34..20f372fa9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,7 +3,7 @@ aechannel=stable
 aebuild=7
 aegroup=appeng
 aebasename=appliedenergistics2
-trousers=omni-fixes-v46
+trousers=omni-fixes-v46b
 
 #########################################################
 # Versions                                              #
diff --git a/src/main/java/appeng/fluids/parts/PartFluidStorageBus.java b/src/main/java/appeng/fluids/parts/PartFluidStorageBus.java
index a74b4885c..c4b044bda 100644
--- a/src/main/java/appeng/fluids/parts/PartFluidStorageBus.java
+++ b/src/main/java/appeng/fluids/parts/PartFluidStorageBus.java
@@ -173,18 +173,23 @@ public class PartFluidStorageBus extends PartSharedStorageBus implements IMEMoni
 		boolean denyRead = false;
 		if( in != null )
 		{
-			AccessRestriction currentAccess = (AccessRestriction) ( (ConfigManager) this.getConfigManager() ).getSetting( Settings.ACCESS );
-			AccessRestriction oldAccess = (AccessRestriction) ( (ConfigManager) this.getConfigManager() ).getOldSetting( Settings.ACCESS );
-			if( oldAccess.hasPermission( AccessRestriction.READ ) && !currentAccess.hasPermission( AccessRestriction.READ ) )
-			{
-				denyRead = true;
-			}
 			if( accessChanged )
 			{
+				AccessRestriction currentAccess = (AccessRestriction) ( (ConfigManager) this.getConfigManager() ).getSetting( Settings.ACCESS );
+				AccessRestriction oldAccess = (AccessRestriction) ( (ConfigManager) this.getConfigManager() ).getOldSetting( Settings.ACCESS );
+				if( oldAccess.hasPermission( AccessRestriction.READ ) && !currentAccess.hasPermission( AccessRestriction.READ ) )
+				{
+					denyRead = true;
+				}
 				in.setBaseAccess( oldAccess );
+				before = in.getAvailableItems( before );
+				in.setBaseAccess( currentAccess );
+				accessChanged = false;
+			}
+			else
+			{
+				before = in.getAvailableItems( before );
 			}
-			before = in.getAvailableItems( before );
-			in.setBaseAccess( currentAccess );
 		}
 
 		this.cached = false;