From 7d83e28a030d491d21a81f4c7af8575fa2e225bb Mon Sep 17 00:00:00 2001 From: mezz Date: Sat, 21 Nov 2015 11:24:35 -0800 Subject: [PATCH] Fix #977 add additional defensive checks to BeekeepingLogic --- src/main/java/forestry/apiculture/BeekeepingLogic.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/forestry/apiculture/BeekeepingLogic.java b/src/main/java/forestry/apiculture/BeekeepingLogic.java index 25aa0b3b6..e001fddfe 100755 --- a/src/main/java/forestry/apiculture/BeekeepingLogic.java +++ b/src/main/java/forestry/apiculture/BeekeepingLogic.java @@ -289,7 +289,13 @@ public class BeekeepingLogic implements IBeekeepingLogic, IStreamable { /** Checks if a queen is alive. Much faster than reading the whole bee nbt */ private static boolean isQueenAlive(ItemStack queenStack) { + if (queenStack == null) { + return false; + } NBTTagCompound nbtTagCompound = queenStack.getTagCompound(); + if (nbtTagCompound == null) { + return false; + } int health = nbtTagCompound.getInteger("Health"); return health > 0; }