From 4f4dbc43074e4c90c686a47f7155ab634bb13a57 Mon Sep 17 00:00:00 2001 From: AlgorithmX2 Date: Wed, 11 Jun 2014 00:22:55 -0500 Subject: [PATCH] Fixed Crash with Fuzzy Upgrade in Export Bus. --- parts/automation/PartExportBus.java | 5 ++++- util/inv/IMEAdaptor.java | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/parts/automation/PartExportBus.java b/parts/automation/PartExportBus.java index 488521cb9..82a15de18 100644 --- a/parts/automation/PartExportBus.java +++ b/parts/automation/PartExportBus.java @@ -27,6 +27,9 @@ import appeng.core.sync.GuiBridge; import appeng.me.GridAccessException; import appeng.util.InventoryAdaptor; import appeng.util.Platform; + +import com.google.common.collect.ImmutableList; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -166,7 +169,7 @@ public class PartExportBus extends PartSharedItemBus implements IGridTickable if ( getInstalledUpgrades( Upgrades.FUZZY ) > 0 ) { - for (IAEItemStack o : inv.getStorageList().findFuzzy( ais, fzMode )) + for (IAEItemStack o : ImmutableList.copyOf( inv.getStorageList().findFuzzy( ais, fzMode ) )) { pushItemIntoTarget( d, energy, fzMode, inv, o ); if ( itemToSend <= 0 ) diff --git a/util/inv/IMEAdaptor.java b/util/inv/IMEAdaptor.java index 26e4d1c7c..11af2efe7 100644 --- a/util/inv/IMEAdaptor.java +++ b/util/inv/IMEAdaptor.java @@ -13,6 +13,8 @@ import appeng.api.storage.data.IItemList; import appeng.util.InventoryAdaptor; import appeng.util.item.AEItemStack; +import com.google.common.collect.ImmutableList; + public class IMEAdaptor extends InventoryAdaptor { @@ -44,7 +46,7 @@ public class IMEAdaptor extends InventoryAdaptor IAEItemStack out = null; - for (IAEItemStack req : getList().findFuzzy( reqFilter, fuzzyMode )) + for (IAEItemStack req : ImmutableList.copyOf( getList().findFuzzy( reqFilter, fuzzyMode ) )) { if ( req != null ) {