From 3d06bb3ba52433705040c126d8be5423690a4764 Mon Sep 17 00:00:00 2001 From: AlgorithmX2 Date: Thu, 17 Apr 2014 22:52:21 -0500 Subject: [PATCH] Fixed bug with Import Bus with 4 accelerators only pulling 64 items. ( should be 96 ) --- me/cache/TickManagerCache.java | 2 +- parts/automation/PartImportBus.java | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/me/cache/TickManagerCache.java b/me/cache/TickManagerCache.java index cc271ab9..3103ecfd 100644 --- a/me/cache/TickManagerCache.java +++ b/me/cache/TickManagerCache.java @@ -68,7 +68,7 @@ public class TickManagerCache implements ITickManager switch (mod) { case FASTER: - tt.setRate( tt.current_rate - 1 ); + tt.setRate( tt.current_rate - 2 ); break; case IDLE: tt.setRate( tt.request.maxTickRate ); diff --git a/parts/automation/PartImportBus.java b/parts/automation/PartImportBus.java index fbff58f9..3774e8ac 100644 --- a/parts/automation/PartImportBus.java +++ b/parts/automation/PartImportBus.java @@ -225,14 +225,16 @@ public class PartImportBus extends PartSharedItemBus implements IGridTickable, I private boolean importStuff(InventoryAdaptor myAdaptor, IAEItemStack whatToImport, IMEMonitor inv, IEnergySource energy, FuzzyMode fzMode) { - if ( itemToSend > 64 ) - itemToSend = 64; + int toSend = this.itemToSend; + + if ( toSend > 64 ) + toSend = 64; ItemStack newItems; if ( getInstalledUpgrades( Upgrades.FUZZY ) > 0 ) - newItems = myAdaptor.removeSimilarItems( itemToSend, whatToImport == null ? null : whatToImport.getItemStack(), fzMode, configDest( inv ) ); + newItems = myAdaptor.removeSimilarItems( toSend, whatToImport == null ? null : whatToImport.getItemStack(), fzMode, configDest( inv ) ); else - newItems = myAdaptor.removeItems( itemToSend, whatToImport == null ? null : whatToImport.getItemStack(), configDest( inv ) ); + newItems = myAdaptor.removeItems( toSend, whatToImport == null ? null : whatToImport.getItemStack(), configDest( inv ) ); if ( newItems != null ) {