Fix #1438 Crash after Breaking Chest

ForestryMC · Oct 10, 2016 · 05a2638 · 05a2638
1 parent 61aa8bd
commit 05a2638
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 12 deletions.
diff --git a/src/main/java/forestry/apiculture/genetics/BeeRoot.java b/src/main/java/forestry/apiculture/genetics/BeeRoot.java
@@ -180,7 +180,7 @@ public boolean isMated(ItemStack stack) {
 
 	@Override
 	public IBee getMember(ItemStack stack) {
-		if (!isMember(stack)) {
+		if (!isMember(stack) || !stack.hasTagCompound()) {
 			return null;
 		}
 

diff --git a/src/main/java/forestry/core/genetics/Individual.java b/src/main/java/forestry/core/genetics/Individual.java
@@ -26,11 +26,7 @@ protected Individual() {
 	}
 
 	protected Individual(@Nonnull NBTTagCompound nbt) {
-		if(nbt.hasKey("IsAnalyzed")){
-			isAnalyzed = nbt.getBoolean("IsAnalyzed");
-		}else{
-			isAnalyzed = false;
-		}
+		isAnalyzed = nbt.getBoolean("IsAnalyzed");
 	}
 
 	@Override

diff --git a/src/main/java/forestry/core/genetics/IndividualLiving.java b/src/main/java/forestry/core/genetics/IndividualLiving.java
@@ -32,12 +32,8 @@ protected IndividualLiving(int newHealth) {
 
 	protected IndividualLiving(@Nonnull NBTTagCompound nbt) {
 		super(nbt);
-		if(nbt.hasKey("Health")){
-			health = nbt.getInteger("Health");
-		}
-		if(nbt.hasKey("MaxH")){
-			maxHealth = nbt.getInteger("MaxH");
-		}
+		health = nbt.getInteger("Health");
+		maxHealth = nbt.getInteger("MaxH");
 	}
 
 	@Override