From bf55ee4a609c8a4cc25f9766e82685a48c6ad6c3 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Fri, 8 Jan 2016 14:41:05 +0000 Subject: [PATCH] Fixed the Hopperhock calling inventory methods on the client side, and thus, crashing when used alongside a BetterStorage Crate. --- .../common/block/subtile/functional/SubTileHopperhock.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java index dbaa47f0c..84aea3c2c 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java @@ -92,7 +92,7 @@ public class SubTileHopperhock extends SubTileFunctional { if(inv != null) { List filter = getFilterForInventory(inv, x_, y_, z_, true); boolean canAccept = canAcceptItem(stack, filter, filterType); - int availablePut = InventoryHelper.testInventoryInsertion(inv, stack, dir); + int availablePut = supertile.getWorldObj().isRemote ? 1 : InventoryHelper.testInventoryInsertion(inv, stack, dir); canAccept &= availablePut > 0; if(canAccept) { @@ -111,9 +111,9 @@ public class SubTileHopperhock extends SubTileFunctional { } } - if(invToPutItemIn != null) { + if(invToPutItemIn != null && !item.isDead) { boolean remote = supertile.getWorldObj().isRemote; - if(!item.isDead && remote) { + if(remote) { if(!particled.contains(item)) { SubTileSpectranthemum.spawnExplosionParticles(item, 3); particled.add(item);