From 298795690ea76451fde13e4714087fa5f80db47e Mon Sep 17 00:00:00 2001 From: mezz Date: Wed, 18 Feb 2015 00:03:56 -0800 Subject: [PATCH] Fix #517 NPE crash when disabling the storage module --- .../forestry/plugins/PluginArboriculture.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/main/java/forestry/plugins/PluginArboriculture.java b/src/main/java/forestry/plugins/PluginArboriculture.java index cca72fc87..4ac4b4f55 100644 --- a/src/main/java/forestry/plugins/PluginArboriculture.java +++ b/src/main/java/forestry/plugins/PluginArboriculture.java @@ -338,16 +338,6 @@ public class PluginArboriculture extends ForestryPlugin { Proxies.render.registerVillagerSkin(Defaults.ID_VILLAGER_LUMBERJACK, Defaults.TEXTURE_SKIN_LUMBERJACK); VillagerRegistry.instance().registerVillageTradeHandler(Defaults.ID_VILLAGER_LUMBERJACK, new VillageHandlerArboriculture()); } - if (PluginManager.Module.FACTORY.isEnabled()) { - ICrateRegistry crateRegistry = StorageManager.crateRegistry; - crateRegistry.registerCrate(EnumFruit.CHERRY.getStack(), "cratedCherry"); - crateRegistry.registerCrate(EnumFruit.WALNUT.getStack(), "cratedWalnut"); - crateRegistry.registerCrate(EnumFruit.CHESTNUT.getStack(), "cratedChestnut"); - crateRegistry.registerCrate(EnumFruit.LEMON.getStack(), "cratedLemon"); - crateRegistry.registerCrate(EnumFruit.PLUM.getStack(), "cratedPlum"); - crateRegistry.registerCrate(EnumFruit.PAPAYA.getStack(), "cratedPapaya"); - crateRegistry.registerCrate(EnumFruit.DATES.getStack(), "cratedDates"); - } } @Override @@ -402,6 +392,14 @@ public class PluginArboriculture extends ForestryPlugin { @Override protected void registerCrates() { + ICrateRegistry crateRegistry = StorageManager.crateRegistry; + crateRegistry.registerCrate(EnumFruit.CHERRY.getStack(), "cratedCherry"); + crateRegistry.registerCrate(EnumFruit.WALNUT.getStack(), "cratedWalnut"); + crateRegistry.registerCrate(EnumFruit.CHESTNUT.getStack(), "cratedChestnut"); + crateRegistry.registerCrate(EnumFruit.LEMON.getStack(), "cratedLemon"); + crateRegistry.registerCrate(EnumFruit.PLUM.getStack(), "cratedPlum"); + crateRegistry.registerCrate(EnumFruit.PAPAYA.getStack(), "cratedPapaya"); + crateRegistry.registerCrate(EnumFruit.DATES.getStack(), "cratedDates"); } @Override