- General: Fixxed item merge bug

This commit is contained in:
HellFirePvP committed 2015-11-13 08:46:24 +01:00
1 parent 6b0d70b10e
commit 8188f3d053
3 files changed
+10 -1

No files matched your search

@@ -56,10 +56,15 @@ public class BlockAuraPylon extends BlockContainer implements IBlockTransparent
list.add(new ItemStack(item, 1, 1));
}
@Override
public int damageDropped(int meta) {
return meta;
}
@Override
public boolean canReplace(World world, int x, int y, int z, int side, ItemStack stack) {
int damage = stack.getItemDamage();
if (damage == 1 && (y < 1 || world.getBlock(x, y - 1, z) != RegisteredBlocks.blockAuraPylon) && (y < 1 || world.getBlockMetadata(x, y - 1, z) != 0)) {
if (damage == 1 && (y < 1 || world.getBlock(x, y - 1, z) != RegisteredBlocks.blockAuraPylon || world.getBlockMetadata(x, y - 1, z) != 0)) {
return false;
}
return super.canReplace(world, x, y, z, side, stack);
@@ -16,6 +16,8 @@ public class ItemBlockAuraPylon extends ItemBlock {
public ItemBlockAuraPylon(Block block) {
super(block);
setMaxDamage(0);
setHasSubtypes(true);
}
@Override
@@ -16,6 +16,8 @@ import net.minecraft.util.IIcon;
public class ItemBlockStoneMachine extends ItemBlock {
public ItemBlockStoneMachine(Block block) {
super(block);
setMaxDamage(0);
setHasSubtypes(true);
}
@Override