tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity

Fixed Bug: #1091 - Crash with Interface

Browse source 
- Also formatted Changes.
This commit is contained in:
AlgorithmX2 2014-09-16 19:11:52 -05:00
parent e13d5097b3
commit 3c8c773e2f
1 changed files with 26 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
me/storage/MEMonitorIInventory.java
View file

@ -3,8 +3,8 @@ package appeng.me.storage;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.NavigableMap;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.NavigableMap;
import java.util.TreeMap; import java.util.TreeMap;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
@ -30,7 +30,8 @@ public class MEMonitorIInventory implements IMEInventory<IAEItemStack>, IMEMonit
class CachedItemStack class CachedItemStack
{ {
public CachedItemStack(ItemStack is) { public CachedItemStack(ItemStack is)
{
if ( is == null ) if ( is == null )
{ {
itemStack = null; itemStack = null;
@ -68,7 +69,8 @@ public class MEMonitorIInventory implements IMEInventory<IAEItemStack>, IMEMonit
listeners.remove( l ); listeners.remove( l );
} }
public MEMonitorIInventory(InventoryAdaptor adaptor) { public MEMonitorIInventory(InventoryAdaptor adaptor)
{
this.adaptor = adaptor; this.adaptor = adaptor;
memory = new TreeMap(); memory = new TreeMap();
} }
@ -226,12 +228,15 @@ public class MEMonitorIInventory implements IMEInventory<IAEItemStack>, IMEMonit
if ( !end.isEmpty() ) if ( !end.isEmpty() )
{ {
for (CachedItemStack cis : end.values()) for (CachedItemStack cis : end.values())
{
if ( cis != null )
{ {
IAEItemStack a = cis.aeStack.copy(); IAEItemStack a = cis.aeStack.copy();
a.setStackSize( -a.getStackSize() ); a.setStackSize( -a.getStackSize() );
changes.add( a ); changes.add( a );
changed = true; changed = true;
} }
}
end.clear(); end.clear();
} }