From 9f2692153794401c675cfdb05fcda8fef2cceabd Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Thu, 5 Feb 2015 21:23:33 -0500 Subject: [PATCH] Fix painted glowstone and lights dropping the wrong items --- .../enderio/machine/light/BlockElectricLight.java | 5 +++++ .../enderio/machine/painter/BlockPaintedGlowstone.java | 7 +++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/crazypants/enderio/machine/light/BlockElectricLight.java b/src/main/java/crazypants/enderio/machine/light/BlockElectricLight.java index 37ad51ea..e878b6b3 100644 --- a/src/main/java/crazypants/enderio/machine/light/BlockElectricLight.java +++ b/src/main/java/crazypants/enderio/machine/light/BlockElectricLight.java @@ -199,6 +199,11 @@ public class BlockElectricLight extends BlockEio implements IRedstoneConnectable drop.setItemDamage(meta); } + @Override + public boolean doNormalDrops(World world, int x, int y, int z) { + return false; + } + @Override public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { TileEntity te = world.getTileEntity(x, y, z); diff --git a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java index b741730c..dbcff41d 100644 --- a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java +++ b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java @@ -11,7 +11,6 @@ import net.minecraft.client.particle.EntityDiggingFX; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -217,10 +216,10 @@ public class BlockPaintedGlowstone extends BlockEio implements ITileEntityProvid drop.stackTagCompound = (NBTTagCompound) itemStack.stackTagCompound.copy(); } } - + @Override - public int quantityDropped(Random par1Random) { - return 0; // need to do custom dropping to maintain source metadata + public boolean doNormalDrops(World world, int x, int y, int z) { + return false; } @Override