From 3bebde687e1f98d21fe4e4dc4a2645ab07c9c548 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 13 Oct 2018 02:14:51 -0500 Subject: [PATCH] Fix #2764 --- .../vazkii/botania/common/item/lens/LensMine.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/lens/LensMine.java b/src/main/java/vazkii/botania/common/item/lens/LensMine.java index e3f5d67f9..4a47290c6 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensMine.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensMine.java @@ -11,8 +11,8 @@ package vazkii.botania.common.item.lens; import net.minecraft.block.Block; +import net.minecraft.block.BlockShulkerBox; import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; @@ -27,11 +27,7 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ModItems; -import java.util.ArrayList; -import java.util.List; - public class LensMine extends Lens { - @Override public boolean collideBurst(IManaBurst burst, EntityThrowable entity, RayTraceResult rtr, boolean isManaBlock, boolean dead, ItemStack stack) { World world = entity.world; @@ -73,9 +69,13 @@ public class LensMine extends Lens { boolean doWarp = warp && !offBounds; BlockPos dropCoord = doWarp ? source : collidePos; - for(ItemStack stack_ : items) + for(ItemStack stack_ : items) { + // Shulker boxes do weird things and drop themselves in breakBlock, so don't drop any dupes + if(block instanceof BlockShulkerBox && Block.getBlockFromItem(stack_.getItem()) instanceof BlockShulkerBox) + continue; if(world.rand.nextFloat() <= chance) Block.spawnAsEntity(world, dropCoord, stack_); + } burst.setMana(mana - 24); }