From 93272cd92fd6d50e714db948165f383c156b4516 Mon Sep 17 00:00:00 2001 From: Xander Date: Sun, 25 Mar 2018 16:31:05 +0800 Subject: [PATCH] fix atomic disassembler item stack checks. Fixes #4938 --- .../mekanism/common/item/ItemAtomicDisassembler.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java b/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java index 963e198f0..97f616467 100644 --- a/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java +++ b/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java @@ -129,7 +129,7 @@ public class ItemAtomicDisassembler extends ItemEnergized block = Blocks.REDSTONE_ORE; } - ItemStack stack = new ItemStack(block, 1, meta); + ItemStack stack = block.getPickBlock(state, null, player.world, pos, player); Coord4D orig = new Coord4D(pos, player.world); List names = MekanismUtils.getOreDictName(stack); @@ -369,6 +369,8 @@ public class ItemAtomicDisassembler extends ItemEnergized public Set found = new HashSet<>(); + private Block startBlock; + public static Map> ignoreBlocks = new HashMap<>(); public Finder(World w, ItemStack s, Coord4D loc) @@ -376,6 +378,7 @@ public class ItemAtomicDisassembler extends ItemEnergized world = w; stack = s; location = loc; + startBlock = loc.getBlock(w); } public void loop(Coord4D pointer) @@ -391,7 +394,9 @@ public class ItemAtomicDisassembler extends ItemEnergized { Coord4D coord = pointer.offset(side); - if(coord.exists(world) && checkID(coord.getBlock(world)) && (coord.getBlockMeta(world) == stack.getItemDamage() || (MekanismUtils.getOreDictName(stack).contains("logWood") && coord.getBlockMeta(world) % 4 == stack.getItemDamage() % 4))) + ItemStack blockStack = coord.getBlock(world).getPickBlock(coord.getBlockState(world), null, world, coord.getPos(), null); + + if(coord.exists(world) && checkID(coord.getBlock(world)) && (stack.isItemEqual(blockStack) || (coord.getBlock(world) == startBlock && MekanismUtils.getOreDictName(stack).contains("logWood") && coord.getBlockMeta(world) % 4 == stack.getItemDamage() % 4))) { loop(coord); }