From d1328cff6ce4a4ebd0278a988b1292e2c4ea080f Mon Sep 17 00:00:00 2001 From: mezz Date: Tue, 27 Oct 2015 00:13:54 -0700 Subject: [PATCH] Fix #923 Alvearies get disconnected from pipes on server start --- .../apiculture/multiblock/AlvearyController.java | 7 ++++++- .../apiculture/multiblock/TileAlveary.java | 4 ++++ .../multiblock/MultiblockControllerBase.java | 10 ++++++---- .../farming/multiblock/FarmController.java | 7 ++++++- .../java/forestry/farming/tiles/TileFarm.java | 16 ++++++++++++++++ 5 files changed, 38 insertions(+), 6 deletions(-) diff --git a/src/main/java/forestry/apiculture/multiblock/AlvearyController.java b/src/main/java/forestry/apiculture/multiblock/AlvearyController.java index fec4bcf3f..3b2908fd3 100644 --- a/src/main/java/forestry/apiculture/multiblock/AlvearyController.java +++ b/src/main/java/forestry/apiculture/multiblock/AlvearyController.java @@ -36,6 +36,7 @@ import forestry.api.core.EnumTemperature; import forestry.api.core.IClimateControlled; import forestry.apiculture.BeeHousingInventory; import forestry.core.access.EnumAccess; +import forestry.core.inventory.FakeInventoryAdapter; import forestry.core.inventory.IInventoryAdapter; import forestry.core.multiblock.CoordTriplet; import forestry.core.multiblock.IMultiblockPart; @@ -88,7 +89,11 @@ public class AlvearyController extends RectangularMultiblockControllerBase imple @Override public IInventoryAdapter getInternalInventory() { - return inventory; + if (isAssembled()) { + return inventory; + } else { + return FakeInventoryAdapter.instance(); + } } @Override diff --git a/src/main/java/forestry/apiculture/multiblock/TileAlveary.java b/src/main/java/forestry/apiculture/multiblock/TileAlveary.java index 2e4103640..f5059781b 100644 --- a/src/main/java/forestry/apiculture/multiblock/TileAlveary.java +++ b/src/main/java/forestry/apiculture/multiblock/TileAlveary.java @@ -94,6 +94,8 @@ public abstract class TileAlveary extends RectangularMultiblockTileEntityBase im if (worldObj.isRemote) { this.worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); } + notifyNeighborsOfBlockChange(); + markDirty(); } @Override @@ -104,6 +106,8 @@ public abstract class TileAlveary extends RectangularMultiblockTileEntityBase im if (worldObj.isRemote) { this.worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); } + notifyNeighborsOfBlockChange(); + markDirty(); } /* IHousing */ diff --git a/src/main/java/forestry/core/multiblock/MultiblockControllerBase.java b/src/main/java/forestry/core/multiblock/MultiblockControllerBase.java index c4799ae83..abe53dc19 100644 --- a/src/main/java/forestry/core/multiblock/MultiblockControllerBase.java +++ b/src/main/java/forestry/core/multiblock/MultiblockControllerBase.java @@ -428,11 +428,12 @@ public abstract class MultiblockControllerBase implements ISidedInventory, IRest * Calls onMachineAssembled on all attached parts. */ private void assembleMachine(AssemblyState oldState) { + this.assemblyState = AssemblyState.Assembled; + for (IMultiblockPart part : connectedParts) { part.onMachineAssembled(this); } - - this.assemblyState = AssemblyState.Assembled; + if (oldState == AssemblyState.Paused) { onMachineRestored(); } else { @@ -447,11 +448,12 @@ public abstract class MultiblockControllerBase implements ISidedInventory, IRest * Calls onMachineBroken on all attached parts. */ private void disassembleMachine() { + this.assemblyState = AssemblyState.Disassembled; + for (IMultiblockPart part : connectedParts) { part.onMachineBroken(); } - - this.assemblyState = AssemblyState.Disassembled; + onMachineDisassembled(); } diff --git a/src/main/java/forestry/farming/multiblock/FarmController.java b/src/main/java/forestry/farming/multiblock/FarmController.java index 4207fc356..b6dfce304 100644 --- a/src/main/java/forestry/farming/multiblock/FarmController.java +++ b/src/main/java/forestry/farming/multiblock/FarmController.java @@ -55,6 +55,7 @@ import forestry.core.errors.EnumErrorCode; import forestry.core.fluids.Fluids; import forestry.core.fluids.TankManager; import forestry.core.fluids.tanks.FilteredTank; +import forestry.core.inventory.FakeInventoryAdapter; import forestry.core.inventory.IInventoryAdapter; import forestry.core.inventory.InventoryAdapter; import forestry.core.multiblock.CoordTriplet; @@ -152,7 +153,11 @@ public class FarmController extends RectangularMultiblockControllerBase implemen @Override public IInventoryAdapter getInternalInventory() { - return inventory; + if (isAssembled()) { + return inventory; + } else { + return FakeInventoryAdapter.instance(); + } } @Override diff --git a/src/main/java/forestry/farming/tiles/TileFarm.java b/src/main/java/forestry/farming/tiles/TileFarm.java index 5c506a5b9..db18c2075 100644 --- a/src/main/java/forestry/farming/tiles/TileFarm.java +++ b/src/main/java/forestry/farming/tiles/TileFarm.java @@ -59,6 +59,22 @@ public abstract class TileFarm extends RectangularMultiblockTileEntityBase imple } } + @Override + public void onMachineAssembled(MultiblockControllerBase controller) { + super.onMachineAssembled(controller); + + notifyNeighborsOfBlockChange(); + markDirty(); + } + + @Override + public void onMachineBroken() { + super.onMachineBroken(); + + notifyNeighborsOfBlockChange(); + markDirty(); + } + @Override public IInventoryAdapter getInternalInventory() { return getFarmController().getInternalInventory();