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 81386e0c8..f64fd02a7 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 @@ -53,7 +53,7 @@ public class SubTileHopperhock extends SubTileFunctional { public void onUpdate() { super.onUpdate(); - if(redstoneSignal > 0 || supertile.getWorldObj().isRemote) + if(redstoneSignal > 0) return; boolean pulledAny = false; @@ -102,10 +102,15 @@ public class SubTileHopperhock extends SubTileFunctional { } if(invToPutItemIn != null) { - InventoryHelper.insertItemIntoInventory(invToPutItemIn, stack.copy(), sideToPutItemIn, -1); - invToPutItemIn.markDirty(); - item.setDead(); - pulledAny = true; + boolean remote = supertile.getWorldObj().isRemote; + if(!item.isDead && remote) + SubTileSpectranthemum.spawnExplosionParticles(item, 1); + else { + InventoryHelper.insertItemIntoInventory(invToPutItemIn, stack.copy(), sideToPutItemIn, -1); + invToPutItemIn.markDirty(); + item.setDead(); + pulledAny = true; + } } } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java index 733d35b97..7bc96f133 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java @@ -66,11 +66,11 @@ public class SubTileSpectranthemum extends SubTileFunctional { int cost = stack.stackSize * COST; if(mana >= cost) { - spawnExplosionParticles(item); + spawnExplosionParticles(item, 10); item.setPosition(bindX + 0.5, bindY + 1.5, bindZ + 0.5); item.getEntityData().setBoolean(TAG_TELEPORTED, true); item.motionX = item.motionY = item.motionZ = 0; - spawnExplosionParticles(item); + spawnExplosionParticles(item, 10); if(!supertile.getWorldObj().isRemote) { mana -= cost; did = true; @@ -84,8 +84,8 @@ public class SubTileSpectranthemum extends SubTileFunctional { } } - void spawnExplosionParticles(EntityItem item) { - for(int i = 0; i < 10; i++) { + public static void spawnExplosionParticles(EntityItem item, int p) { + for(int i = 0; i < p; i++) { double m = 0.01; double d0 = item.worldObj.rand.nextGaussian() * m; double d1 = item.worldObj.rand.nextGaussian() * m;