From 74fbd89b84b80fb03d5391c540dbcd29b28bba52 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Mon, 30 Jun 2014 16:00:31 +0100 Subject: [PATCH] Fixed the Weight lens being able to move Tile Entities and unbreaking blocks like bedrock. --- MODSRC/vazkii/botania/common/item/ItemLens.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/MODSRC/vazkii/botania/common/item/ItemLens.java b/MODSRC/vazkii/botania/common/item/ItemLens.java index e76c3f18e..6b63d92fd 100644 --- a/MODSRC/vazkii/botania/common/item/ItemLens.java +++ b/MODSRC/vazkii/botania/common/item/ItemLens.java @@ -274,8 +274,10 @@ public class ItemLens extends ItemMod implements ILens { int x = pos.blockX; int y = pos.blockY; int z = pos.blockZ; - if(entity.worldObj.getBlock(x, y - 1, z).isAir(entity.worldObj, x, y - 1, z)) { - EntityFallingBlock falling = new EntityFallingBlock(entity.worldObj, x + 0.5, y + 0.5, z + 0.5, entity.worldObj.getBlock(x, y, z), entity.worldObj.getBlockMetadata(x, y, z)); + Block block = entity.worldObj.getBlock(x, y, z); + Block blockBelow = entity.worldObj.getBlock(x, y - 1, z); + if(blockBelow.isAir(entity.worldObj, x, y - 1, z) && block.getBlockHardness(entity.worldObj, x, y, z) != -1 && entity.worldObj.getTileEntity(x, y, z) == null) { + EntityFallingBlock falling = new EntityFallingBlock(entity.worldObj, x + 0.5, y + 0.5, z + 0.5, block, entity.worldObj.getBlockMetadata(x, y, z)); if(!entity.worldObj.isRemote) entity.worldObj.spawnEntityInWorld(falling); }