From 63ba9903eae49582bbce8f3bff68ccfa03314107 Mon Sep 17 00:00:00 2001 From: mezz Date: Sat, 1 Aug 2015 00:16:03 -0700 Subject: [PATCH] Fix #779 Village apiaries are inactive, lose inventory after reload --- api/forestry | 2 +- .../forestry/apiculture/BeekeepingLogic.java | 16 +++++++++------- .../apiculture/FakeBeekeepingLogic.java | 5 +++++ .../apiculture/gadgets/TileBeeHousing.java | 7 +++++++ .../multiblock/AlvearyController.java | 1 + .../java/forestry/core/proxy/ProxyNetwork.java | 18 ++++++------------ 6 files changed, 29 insertions(+), 20 deletions(-) diff --git a/api/forestry b/api/forestry index bc09d990a..c89dc65d0 160000 --- a/api/forestry +++ b/api/forestry @@ -1 +1 @@ -Subproject commit bc09d990a7f87586ba1720fca735ecfed7469039 +Subproject commit c89dc65d0094dd490e8435ec46237134645b2e74 diff --git a/src/main/java/forestry/apiculture/BeekeepingLogic.java b/src/main/java/forestry/apiculture/BeekeepingLogic.java index 86ebd27b4..e8c97338c 100755 --- a/src/main/java/forestry/apiculture/BeekeepingLogic.java +++ b/src/main/java/forestry/apiculture/BeekeepingLogic.java @@ -147,13 +147,7 @@ public class BeekeepingLogic implements IBeekeepingLogic, IStreamable { } this.active = active; - if (!housing.getWorld().isRemote) { - Proxies.net.sendNetworkPacket(new PacketBeekeepingLogicActive(housing), housing.getWorld()); - } - } - - public boolean isActive() { - return active; + syncToClient(); } /* UPDATING */ @@ -418,6 +412,14 @@ public class BeekeepingLogic implements IBeekeepingLogic, IStreamable { /* CLIENT */ + @Override + public void syncToClient() { + World world = housing.getWorld(); + if (world != null && !world.isRemote) { + Proxies.net.sendNetworkPacket(new PacketBeekeepingLogicActive(housing), world); + } + } + @Override public int getBeeProgressPercent() { if (beeProgressMax == 0) { diff --git a/src/main/java/forestry/apiculture/FakeBeekeepingLogic.java b/src/main/java/forestry/apiculture/FakeBeekeepingLogic.java index 4d0338125..ee434027a 100644 --- a/src/main/java/forestry/apiculture/FakeBeekeepingLogic.java +++ b/src/main/java/forestry/apiculture/FakeBeekeepingLogic.java @@ -31,6 +31,11 @@ public class FakeBeekeepingLogic implements IBeekeepingLogic { } + @Override + public void syncToClient() { + + } + @Override public int getBeeProgressPercent() { return 0; diff --git a/src/main/java/forestry/apiculture/gadgets/TileBeeHousing.java b/src/main/java/forestry/apiculture/gadgets/TileBeeHousing.java index 2bf75382f..a31ac285b 100644 --- a/src/main/java/forestry/apiculture/gadgets/TileBeeHousing.java +++ b/src/main/java/forestry/apiculture/gadgets/TileBeeHousing.java @@ -13,6 +13,7 @@ package forestry.apiculture.gadgets; import net.minecraft.inventory.Container; import net.minecraft.inventory.ICrafting; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.Packet; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; @@ -59,6 +60,12 @@ public abstract class TileBeeHousing extends TileBase implements IBeeHousing, IC beeLogic.readFromNBT(nbttagcompound); } + @Override + public Packet getDescriptionPacket() { + beeLogic.syncToClient(); + return super.getDescriptionPacket(); + } + /* ICLIMATISED */ @Override public EnumTemperature getTemperature() { diff --git a/src/main/java/forestry/apiculture/multiblock/AlvearyController.java b/src/main/java/forestry/apiculture/multiblock/AlvearyController.java index 9445ab113..744a5c0ad 100644 --- a/src/main/java/forestry/apiculture/multiblock/AlvearyController.java +++ b/src/main/java/forestry/apiculture/multiblock/AlvearyController.java @@ -338,6 +338,7 @@ public class AlvearyController extends RectangularMultiblockControllerBase imple @Override public void formatDescriptionPacket(NBTTagCompound data) { writeToNBT(data); + beekeepingLogic.syncToClient(); } @Override diff --git a/src/main/java/forestry/core/proxy/ProxyNetwork.java b/src/main/java/forestry/core/proxy/ProxyNetwork.java index a91c23181..2f71076ec 100755 --- a/src/main/java/forestry/core/proxy/ProxyNetwork.java +++ b/src/main/java/forestry/core/proxy/ProxyNetwork.java @@ -12,6 +12,7 @@ package forestry.core.proxy; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.server.management.PlayerManager; import net.minecraft.world.World; import net.minecraft.world.WorldServer; @@ -27,31 +28,24 @@ public class ProxyNetwork { if (packet == null || !(world instanceof WorldServer)) { return; } - int x = packet.getPosX(); - int y = packet.getPosY(); - int z = packet.getPosZ(); WorldServer worldServer = (WorldServer) world; - int viewDistance = (worldServer.func_73046_m().getConfigurationManager().getViewDistance() + 1) * 16; + PlayerManager playerManager = worldServer.getPlayerManager(); + + int chunkX = packet.getPosX() >> 4; + int chunkZ = packet.getPosZ() >> 4; for (Object playerObj : world.playerEntities) { if (playerObj instanceof EntityPlayerMP) { EntityPlayerMP player = (EntityPlayerMP) playerObj; - if (isPlayerInRange(player, viewDistance, x, y, z)) { + if (playerManager.isPlayerWatchingChunk(player, chunkX, chunkZ)) { Forestry.packetHandler.sendPacket(packet.getPacket(), player); } } } } - private static boolean isPlayerInRange(EntityPlayerMP player, int viewDistance, int x, int y, int z) { - double distX = player.posX - x; - double distY = player.posY - y; - double distZ = player.posZ - z; - return (distX * distX) + (distY * distY) + (distZ * distZ) < (viewDistance * viewDistance); - } - public void sendToPlayer(ForestryPacket packet, EntityPlayer entityplayer) { if (!(entityplayer instanceof EntityPlayerMP) || (entityplayer instanceof FakePlayer)) { return;