From fb523c20643e5bdd27cc78b72256eecaad5a7045 Mon Sep 17 00:00:00 2001 From: mezz Date: Thu, 19 May 2016 14:48:42 -0700 Subject: [PATCH] Fix #1171 Bee life cycle indicator desync --- .../forestry/apiculture/gui/ContainerAlveary.java | 12 ++++++++++-- .../forestry/apiculture/gui/ContainerBeeHousing.java | 2 +- .../apiculture/gui/ContainerMinecartBeehouse.java | 2 +- .../core/network/packets/PacketGuiUpdateEntity.java | 2 +- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/main/java/forestry/apiculture/gui/ContainerAlveary.java b/src/main/java/forestry/apiculture/gui/ContainerAlveary.java index a41d43827..4056cc46f 100755 --- a/src/main/java/forestry/apiculture/gui/ContainerAlveary.java +++ b/src/main/java/forestry/apiculture/gui/ContainerAlveary.java @@ -14,6 +14,7 @@ import net.minecraft.entity.player.InventoryPlayer; import forestry.apiculture.multiblock.TileAlveary; import forestry.core.gui.ContainerTile; +import forestry.core.network.IForestryPacketClient; import forestry.core.network.packets.PacketGuiUpdate; public class ContainerAlveary extends ContainerTile { @@ -23,10 +24,17 @@ public class ContainerAlveary extends ContainerTile { ContainerBeeHelper.addSlots(this, tile, false); } + private int beeProgress = -1; + @Override public void detectAndSendChanges() { super.detectAndSendChanges(); - PacketGuiUpdate packet = new PacketGuiUpdate(tile); - sendPacketToListeners(packet); + + int beeProgress = tile.getBeekeepingLogic().getBeeProgressPercent(); + if (this.beeProgress != beeProgress) { + this.beeProgress = beeProgress; + IForestryPacketClient packet = new PacketGuiUpdate(tile); + sendPacketToListeners(packet); + } } } diff --git a/src/main/java/forestry/apiculture/gui/ContainerBeeHousing.java b/src/main/java/forestry/apiculture/gui/ContainerBeeHousing.java index c1032a5b4..881738bbf 100644 --- a/src/main/java/forestry/apiculture/gui/ContainerBeeHousing.java +++ b/src/main/java/forestry/apiculture/gui/ContainerBeeHousing.java @@ -24,7 +24,7 @@ public class ContainerBeeHousing extends ContainerTile imple ContainerBeeHelper.addSlots(this, tile, hasFrames); } - private int beeProgress = 0; + private int beeProgress = -1; @Override public void detectAndSendChanges() { diff --git a/src/main/java/forestry/apiculture/gui/ContainerMinecartBeehouse.java b/src/main/java/forestry/apiculture/gui/ContainerMinecartBeehouse.java index 233742665..6973917f8 100644 --- a/src/main/java/forestry/apiculture/gui/ContainerMinecartBeehouse.java +++ b/src/main/java/forestry/apiculture/gui/ContainerMinecartBeehouse.java @@ -23,7 +23,7 @@ public class ContainerMinecartBeehouse extends ContainerEntity