From 1d377b8889f5afdc20f837b92ba2d975babe1087 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Tue, 12 May 2015 16:18:55 +0100 Subject: [PATCH] Fixed crash when corporea funnels or interceptors have empty item frames. Closes #897 --- .../common/block/tile/corporea/TileCorporeaFunnel.java | 9 ++++++--- .../block/tile/corporea/TileCorporeaInterceptor.java | 3 +++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java index 188aaff8c..2168ddb06 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java @@ -70,9 +70,12 @@ public class TileCorporeaFunnel extends TileCorporeaBase { for(EntityItemFrame frame : frames) { int orientation = frame.hangingDirection; if(orientationToDir[orientation] == dir.ordinal()) { - ItemStack copy = frame.getDisplayedItem().copy(); - copy.stackSize = rotationToStackSize[frame.getRotation()]; - filter.add(copy); + ItemStack stack = frame.getDisplayedItem(); + if(stack != null) { + ItemStack copy = stack.copy(); + copy.stackSize = rotationToStackSize[frame.getRotation()]; + filter.add(copy); + } } } } diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java index f93e97aa2..5685d0900 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java @@ -65,6 +65,9 @@ public class TileCorporeaInterceptor extends TileCorporeaBase implements ICorpor } public boolean requestMatches(Object request, ItemStack filter) { + if(filter == null) + return false; + if(request instanceof ItemStack) { ItemStack stack = (ItemStack) request; return stack != null && stack.isItemEqual(filter) && ItemStack.areItemStacksEqual(filter, stack);