mirror of
https://github.com/GTNewHorizons/ForestryMC.git
synced 2026-11-20 12:09:39 +00:00
Fix #303: Default Farm Logic disappears with smaller circuits
This commit is contained in:
1 parent
4c52620f0f
commit
f47d349056
2 files changed
+9
-7
No files matched your search
@@ -69,8 +69,9 @@ public class CircuitBoard implements ICircuitBoard {
|
||||
if (layout == null)
|
||||
ChipsetManager.circuitRegistry.getDefaultLayout();
|
||||
|
||||
// FIXME: Legacy I
|
||||
ArrayList<ICircuit> readcircuits = new ArrayList<ICircuit>();
|
||||
|
||||
// FIXME: Legacy I
|
||||
if (nbttagcompound.hasKey("CS")) {
|
||||
|
||||
NBTTagList nbttaglist = nbttagcompound.getTagList("CS", 10);
|
||||
@@ -100,12 +101,14 @@ public class CircuitBoard implements ICircuitBoard {
|
||||
if (circuits != null)
|
||||
return;
|
||||
|
||||
circuits = new ICircuit[4];
|
||||
for (int i = 0; i < 4; i++) {
|
||||
if (!nbttagcompound.hasKey("CA.I" + i))
|
||||
continue;
|
||||
circuits[i] = ChipsetManager.circuitRegistry.getCircuit(nbttagcompound.getString("CA.I" + i));
|
||||
ICircuit circuit = ChipsetManager.circuitRegistry.getCircuit(nbttagcompound.getString("CA.I" + i));
|
||||
if (circuit != null)
|
||||
readcircuits.add(circuit);
|
||||
}
|
||||
circuits = readcircuits.toArray(new ICircuit[readcircuits.size()]);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -746,14 +746,13 @@ public class TileFarmPlain extends TileFarm implements IFarmHousing, ISocketable
|
||||
chipset.onRemoval(this);
|
||||
}
|
||||
|
||||
sockets.setInventorySlotContents(slot, stack);
|
||||
refreshFarmLogics();
|
||||
|
||||
if (stack == null) {
|
||||
sockets.setInventorySlotContents(slot, stack);
|
||||
refreshFarmLogics();
|
||||
return;
|
||||
}
|
||||
|
||||
sockets.setInventorySlotContents(slot, stack);
|
||||
|
||||
ICircuitBoard chipset = ChipsetManager.circuitRegistry.getCircuitboard(stack);
|
||||
if (chipset != null)
|
||||
chipset.onInsertion(this);
|
||||
|
||||
Reference in new issue
Block a user