From 55866d6a64c3ef1ac84fb6b2b9dd4ce17272bfdf Mon Sep 17 00:00:00 2001 From: mezz Date: Sat, 3 Oct 2015 00:51:31 -0700 Subject: [PATCH] #830 fix farm crash when Plugin Arboriculture is disabled --- src/main/java/forestry/plugins/PluginFarming.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/forestry/plugins/PluginFarming.java b/src/main/java/forestry/plugins/PluginFarming.java index 818f83fe2..34b7c3ddd 100644 --- a/src/main/java/forestry/plugins/PluginFarming.java +++ b/src/main/java/forestry/plugins/PluginFarming.java @@ -93,8 +93,10 @@ public class PluginFarming extends ForestryPlugin { Farmables.farmables.put("farmArboreal", new ArrayList()); Farmables.farmables.get("farmArboreal").add(new FarmableVanillaSapling()); - Farmables.farmables.get("farmArboreal").add(new FarmableGE()); - + if (PluginManager.Module.ARBORICULTURE.isEnabled()) { + Farmables.farmables.get("farmArboreal").add(new FarmableGE()); + } + Farmables.farmables.put("farmOrchard", new ArrayList()); Farmables.farmables.get("farmOrchard").add(new FarmableBasicFruit(Blocks.wheat, 7)); Farmables.farmables.get("farmOrchard").add(new FarmableBasicFruit(Blocks.potatoes, 7));