fix fluid storagebus NPE crash
This commit is contained in:
+1
-1
@@ -3,7 +3,7 @@ aechannel=stable
|
|||||||
aebuild=7
|
aebuild=7
|
||||||
aegroup=appeng
|
aegroup=appeng
|
||||||
aebasename=appliedenergistics2
|
aebasename=appliedenergistics2
|
||||||
trousers=omni-fixes-v46
|
trousers=omni-fixes-v46b
|
||||||
|
|
||||||
#########################################################
|
#########################################################
|
||||||
# Versions #
|
# Versions #
|
||||||
|
|||||||
@@ -173,18 +173,23 @@ public class PartFluidStorageBus extends PartSharedStorageBus implements IMEMoni
|
|||||||
boolean denyRead = false;
|
boolean denyRead = false;
|
||||||
if( in != null )
|
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 )
|
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 );
|
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;
|
this.cached = false;
|
||||||
|
|||||||
Reference in New Issue
Block a user