From 62eeed92283dd4def31f439f805b2b99c9181d13 Mon Sep 17 00:00:00 2001 From: mezz Date: Tue, 23 Sep 2014 13:37:23 -0700 Subject: [PATCH] Fix #219: Viewing Beelyzer slot 3 crashes game --- .../java/forestry/apiculture/genetics/AlleleBeeSpecies.java | 2 ++ src/main/java/forestry/plugins/PluginApiculture.java | 4 +--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/forestry/apiculture/genetics/AlleleBeeSpecies.java b/src/main/java/forestry/apiculture/genetics/AlleleBeeSpecies.java index bbb1f8366..27a740986 100755 --- a/src/main/java/forestry/apiculture/genetics/AlleleBeeSpecies.java +++ b/src/main/java/forestry/apiculture/genetics/AlleleBeeSpecies.java @@ -86,6 +86,8 @@ public class AlleleBeeSpecies extends AlleleSpecies implements IAlleleBeeSpecies } public AlleleBeeSpecies addProduct(ItemStack product, int chance) { + if (product == null || product.getItem() == null) + throw new IllegalArgumentException("Tried to add null product"); this.products.put(product, chance); return this; } diff --git a/src/main/java/forestry/plugins/PluginApiculture.java b/src/main/java/forestry/plugins/PluginApiculture.java index 78f25a79a..a3f98a0a1 100644 --- a/src/main/java/forestry/plugins/PluginApiculture.java +++ b/src/main/java/forestry/plugins/PluginApiculture.java @@ -247,9 +247,6 @@ public class PluginApiculture extends ForestryPlugin { // Add triggers triggerNoFrames = new TriggerNoFrames(); - // Create bee alleles - createAlleles(); - // Register village components with the Structure registry. VillageHandlerApiculture.registerVillageComponents(); } @@ -283,6 +280,7 @@ public class PluginApiculture extends ForestryPlugin { apicultureConfig.save(); + createAlleles(); createMutations(); registerBeehiveDrops();