Fix cart assembler duplication (closes #1058, #1150)

This commit is contained in:
Snownee 2021-03-12 23:46:26 +08:00
parent 51c919e4d8
commit 6baa519973

View file

@ -366,8 +366,6 @@ public class CartAssemblerBlock extends AbstractRailBlock
@Override @Override
public void neighborChanged(@Nonnull BlockState state, @Nonnull World worldIn, @Nonnull BlockPos pos, public void neighborChanged(@Nonnull BlockState state, @Nonnull World worldIn, @Nonnull BlockPos pos,
@Nonnull Block blockIn, @Nonnull BlockPos fromPos, boolean isMoving) { @Nonnull Block blockIn, @Nonnull BlockPos fromPos, boolean isMoving) {
super.neighborChanged(state, worldIn, pos, blockIn, fromPos, isMoving);
if (worldIn.isRemote) if (worldIn.isRemote)
return; return;
@ -375,6 +373,8 @@ public class CartAssemblerBlock extends AbstractRailBlock
if (previouslyPowered != worldIn.isBlockPowered(pos)) { if (previouslyPowered != worldIn.isBlockPowered(pos)) {
worldIn.setBlockState(pos, state.cycle(POWERED), 2); worldIn.setBlockState(pos, state.cycle(POWERED), 2);
} }
super.neighborChanged(state, worldIn, pos, blockIn, fromPos, isMoving);
} }
@Override @Override
@ -439,7 +439,7 @@ public class CartAssemblerBlock extends AbstractRailBlock
@Override @Override
public ItemRequirement getRequiredItems(BlockState state) { public ItemRequirement getRequiredItems(BlockState state) {
ArrayList<ItemStack> reuiredItems = new ArrayList<ItemStack>(); ArrayList<ItemStack> reuiredItems = new ArrayList<>();
reuiredItems.add(new ItemStack(getRailItem(state))); reuiredItems.add(new ItemStack(getRailItem(state)));
reuiredItems.add(new ItemStack(asItem())); reuiredItems.add(new ItemStack(asItem()));
return new ItemRequirement(ItemUseType.CONSUME, reuiredItems); return new ItemRequirement(ItemUseType.CONSUME, reuiredItems);