From 07ba130dc692988a3734708c323ecd7269d09ed6 Mon Sep 17 00:00:00 2001 From: mezz Date: Fri, 21 Nov 2014 22:00:46 -0800 Subject: [PATCH] Fix #336. infinite loop on server when bee housing is full --- .../java/forestry/apiculture/BeekeepingLogic.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/main/java/forestry/apiculture/BeekeepingLogic.java b/src/main/java/forestry/apiculture/BeekeepingLogic.java index e98d079c1..a8c8fc21d 100755 --- a/src/main/java/forestry/apiculture/BeekeepingLogic.java +++ b/src/main/java/forestry/apiculture/BeekeepingLogic.java @@ -109,7 +109,7 @@ public class BeekeepingLogic implements IBeekeepingLogic { this.queen = null; - if (!didSpawnPendingProducts()) { + if (!addPendingProducts()) { return; } @@ -122,8 +122,6 @@ public class BeekeepingLogic implements IBeekeepingLogic { } queenWorkTick(); - - return; } private void queenWorkTick() { @@ -189,8 +187,7 @@ public class BeekeepingLogic implements IBeekeepingLogic { housing.getQueen().setTagCompound(nbttagcompound); } - private boolean didSpawnPendingProducts() { - boolean didSpawnItem = true; + private boolean addPendingProducts() { EnumErrorCode housingErrorState = null; while (!spawn.isEmpty()) { @@ -200,9 +197,10 @@ public class BeekeepingLogic implements IBeekeepingLogic { housingErrorState = EnumErrorCode.OK; } else { housingErrorState = EnumErrorCode.NOSPACE; - didSpawnItem = false; + break; } } + if (housingErrorState != null) { try { housing.setErrorState(housingErrorState); @@ -210,7 +208,8 @@ public class BeekeepingLogic implements IBeekeepingLogic { housing.setErrorState(housingErrorState.ordinal()); } } - return didSpawnItem; + + return housingErrorState != EnumErrorCode.NOSPACE; } private boolean hasHealthyQueen() {