From b08a618baa0682d8a131fd414c30a714f20bdf32 Mon Sep 17 00:00:00 2001 From: mezz Date: Mon, 2 Feb 2015 22:01:10 -0800 Subject: [PATCH] Fix #478 Manual peat bog doesn't replace bog earth --- src/main/java/forestry/farming/logic/CropPeat.java | 8 +++++--- src/main/java/forestry/farming/logic/FarmLogicPeat.java | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/forestry/farming/logic/CropPeat.java b/src/main/java/forestry/farming/logic/CropPeat.java index ad2a79cab..7abd2a6e4 100755 --- a/src/main/java/forestry/farming/logic/CropPeat.java +++ b/src/main/java/forestry/farming/logic/CropPeat.java @@ -12,15 +12,16 @@ package forestry.farming.logic; import java.util.ArrayList; import java.util.Collection; +import java.util.List; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import forestry.core.config.ForestryItem; import forestry.core.gadgets.BlockSoil; import forestry.core.proxy.Proxies; -import forestry.core.utils.BlockUtil; import forestry.core.vect.Vect; public class CropPeat extends Crop { @@ -43,10 +44,11 @@ public class CropPeat extends Crop { @Override protected Collection harvestBlock(Vect pos) { - ArrayList drops = BlockUtil.getBlockDrops(world, pos); + List drops = new ArrayList(); + drops.add(ForestryItem.peat.getItemStack()); Proxies.common.addBlockDestroyEffects(world, pos.x, pos.y, pos.z, world.getBlock(pos.x, pos.y, pos.z), 0); - setBlock(pos, Blocks.air, 0); + setBlock(pos, Blocks.dirt, 0); return drops; } diff --git a/src/main/java/forestry/farming/logic/FarmLogicPeat.java b/src/main/java/forestry/farming/logic/FarmLogicPeat.java index 29f59b791..ed56279f7 100755 --- a/src/main/java/forestry/farming/logic/FarmLogicPeat.java +++ b/src/main/java/forestry/farming/logic/FarmLogicPeat.java @@ -85,7 +85,7 @@ public class FarmLogicPeat extends FarmLogicWatered { continue; } - Block block = BlockSoil.getBlockFromItem(occupant.getItem()); + Block block = Block.getBlockFromItem(occupant.getItem()); if (block == null || !(block instanceof BlockSoil)) { continue; }