From a137cf8f126f611847a57f75e398330139d3fe3d Mon Sep 17 00:00:00 2001 From: bdew Date: Wed, 9 Sep 2015 13:38:26 +0300 Subject: [PATCH] Fixed BeekeepingLogic overwriting queen with old data --- 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 561ed71b7..29d79dac0 100755 --- a/src/main/java/forestry/apiculture/BeekeepingLogic.java +++ b/src/main/java/forestry/apiculture/BeekeepingLogic.java @@ -46,6 +46,7 @@ public class BeekeepingLogic implements IBeekeepingLogic { private int breedingTime; private int queenWorkCycleThrottle; private IEffectData effectData[] = new IEffectData[2]; + private ItemStack queenStack; private IBee queen; private IIndividual pollen; private int attemptedPollinations = 0; @@ -309,6 +310,11 @@ public class BeekeepingLogic implements IBeekeepingLogic { ItemStack queenStack = housing.getQueen(); + if (!ItemStack.areItemStacksEqual(this.queenStack, queenStack)) { + this.queen = BeeManager.beeRoot.getMember(queenStack); + this.queenStack = queenStack; + } + if (queenStack == null || !ForestryItem.beeQueenGE.isItemEqual(queenStack)) { housingErrorState = EnumErrorCode.NOQUEEN; hasQueen = false;