From c97165cc635b26fe70e64dafc3272c204f798702 Mon Sep 17 00:00:00 2001 From: fscan Date: Sat, 22 Jul 2017 21:24:19 +0200 Subject: [PATCH] Fix NPE in MEMonitorIInventory.onTick (#2972) --- src/main/java/appeng/me/storage/MEMonitorIInventory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/appeng/me/storage/MEMonitorIInventory.java b/src/main/java/appeng/me/storage/MEMonitorIInventory.java index 80c0721cf..c5845081a 100644 --- a/src/main/java/appeng/me/storage/MEMonitorIInventory.java +++ b/src/main/java/appeng/me/storage/MEMonitorIInventory.java @@ -153,7 +153,7 @@ public class MEMonitorIInventory implements IMEMonitor, ITickingMo final CachedItemStack old = this.memory.get( is.getSlot() ); high = Math.max( high, is.getSlot() ); - final ItemStack newIS = !is.isExtractable() && this.getMode() == StorageFilter.EXTRACTABLE_ONLY ? null : is.getItemStack(); + final ItemStack newIS = !is.isExtractable() && this.getMode() == StorageFilter.EXTRACTABLE_ONLY ? ItemStack.EMPTY : is.getItemStack(); final ItemStack oldIS = old == null ? ItemStack.EMPTY : old.itemStack; if( this.isDifferent( newIS, oldIS ) )