From af1f5c34d26ff784b32236d7cac88dee1cdab0d1 Mon Sep 17 00:00:00 2001 From: PrototypeTrousers Date: Sun, 30 Jan 2022 17:19:01 -0300 Subject: [PATCH] fix npe when placing down an ore dict storage bus --- gradle.properties | 2 +- .../java/appeng/parts/misc/PartOreDicStorageBus.java | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 05815a891..3ec0d43c0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ aebuild=7 aegroup=appeng aebasename=appliedenergistics2 extended=extended_life -extendedversion=v49aa +extendedversion=v49ab ######################################################### # Versions # ######################################################### diff --git a/src/main/java/appeng/parts/misc/PartOreDicStorageBus.java b/src/main/java/appeng/parts/misc/PartOreDicStorageBus.java index 4c02365de..61a7993d5 100644 --- a/src/main/java/appeng/parts/misc/PartOreDicStorageBus.java +++ b/src/main/java/appeng/parts/misc/PartOreDicStorageBus.java @@ -20,6 +20,7 @@ import appeng.parts.PartModel; import appeng.util.ConfigManager; import appeng.util.Platform; import appeng.util.item.OreHelper; +import appeng.util.prioritylist.IPartitionList; import appeng.util.prioritylist.OreDictPriorityList; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -125,7 +126,7 @@ public class PartOreDicStorageBus extends PartStorageBus this.handler.setWhitelist( this.getInstalledUpgrades( Upgrades.INVERTER ) > 0 ? IncludeExclude.BLACKLIST : IncludeExclude.WHITELIST ); this.handler.setPriority( this.priority ); - this.handler.setPartitionList( priorityList ); + this.handler.setPartitionList( this.getPriorityList() ); if( inv instanceof IBaseMonitor ) { @@ -171,6 +172,15 @@ public class PartOreDicStorageBus extends PartStorageBus return this.handler; } + private IPartitionList getPriorityList() + { + if( priorityList == null ) + { + this.priorityList = new OreDictPriorityList<>( OreHelper.INSTANCE.getMatchingOre( oreExp ), oreExp ); + } + return priorityList; + } + public String getOreExp() { if( this.oreExp == null )