mirror of
https://github.com/GTNewHorizons/ForestryMC.git
synced 2026-11-19 03:39:09 +00:00
Fix #923 Alvearies get disconnected from pipes on server start
This commit is contained in:
1 parent
45f844b53b
commit
d1328cff6c
5 files changed
+38
-6
No files matched your search
@@ -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
|
||||
|
||||
@@ -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 */
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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();
|
||||
|
||||
Reference in new issue
Block a user