From 8cc0da5c044cedb5f2cb586bd6d8744537364ec7 Mon Sep 17 00:00:00 2001 From: mezz Date: Mon, 5 Oct 2015 23:42:00 -0700 Subject: [PATCH] Fix #830 Multifarms do not plant saplings when Arboriculture is disabled --- .../farming/logic/FarmableVanillaSapling.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/main/java/forestry/farming/logic/FarmableVanillaSapling.java b/src/main/java/forestry/farming/logic/FarmableVanillaSapling.java index 580515b82..0e9e12f75 100755 --- a/src/main/java/forestry/farming/logic/FarmableVanillaSapling.java +++ b/src/main/java/forestry/farming/logic/FarmableVanillaSapling.java @@ -20,6 +20,7 @@ import forestry.api.arboriculture.ITree; import forestry.api.arboriculture.TreeManager; import forestry.api.genetics.IIndividual; import forestry.core.utils.GeneticsUtil; +import forestry.plugins.PluginManager; public class FarmableVanillaSapling extends FarmableGenericSapling { @@ -29,12 +30,16 @@ public class FarmableVanillaSapling extends FarmableGenericSapling { @Override public boolean plantSaplingAt(EntityPlayer player, ItemStack germling, World world, int x, int y, int z) { - IIndividual tree = GeneticsUtil.getGeneticEquivalent(germling); - if (!(tree instanceof ITree)) { - return false; - } + if (PluginManager.Module.ARBORICULTURE.isEnabled()) { + IIndividual tree = GeneticsUtil.getGeneticEquivalent(germling); + if (!(tree instanceof ITree)) { + return false; + } - return TreeManager.treeRoot.plantSapling(world, (ITree) tree, player.getGameProfile(), x, y, z); + return TreeManager.treeRoot.plantSapling(world, (ITree) tree, player.getGameProfile(), x, y, z); + } else { + return germling.copy().tryPlaceItemIntoWorld(player, world, x, y - 1, z, 1, 0, 0, 0); + } } }