From f47d3490560600cfc3d2134defdecc9790f3ed65 Mon Sep 17 00:00:00 2001 From: mezz Date: Sun, 26 Oct 2014 21:03:08 -0700 Subject: [PATCH] Fix #303: Default Farm Logic disappears with smaller circuits --- src/main/java/forestry/core/circuits/CircuitBoard.java | 9 ++++++--- .../java/forestry/farming/gadgets/TileFarmPlain.java | 7 +++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/main/java/forestry/core/circuits/CircuitBoard.java b/src/main/java/forestry/core/circuits/CircuitBoard.java index 3b9c0b7e5..d72ba6ebe 100755 --- a/src/main/java/forestry/core/circuits/CircuitBoard.java +++ b/src/main/java/forestry/core/circuits/CircuitBoard.java @@ -69,8 +69,9 @@ public class CircuitBoard implements ICircuitBoard { if (layout == null) ChipsetManager.circuitRegistry.getDefaultLayout(); - // FIXME: Legacy I ArrayList readcircuits = new ArrayList(); + + // 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 diff --git a/src/main/java/forestry/farming/gadgets/TileFarmPlain.java b/src/main/java/forestry/farming/gadgets/TileFarmPlain.java index 9548cf10b..349c03e32 100755 --- a/src/main/java/forestry/farming/gadgets/TileFarmPlain.java +++ b/src/main/java/forestry/farming/gadgets/TileFarmPlain.java @@ -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);