diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 33b1025ef2..3216544880 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -6483,6 +6483,7 @@ public class Blocks{ regionSuffix = "-dark"; size = 3; + configurable = false; consumePower(3f); consumeLiquid(Liquids.hydrogen, 3f / 60f); consumeItems(with(Items.silicon, 40, Items.tungsten, 30)); @@ -6500,6 +6501,7 @@ public class Blocks{ regionSuffix = "-dark"; size = 3; + configurable = false; consumePower(2.5f); consumeLiquid(Liquids.hydrogen, 3f / 60f); consumeItems(with(Items.silicon, 60, Items.tungsten, 40)); @@ -6518,6 +6520,7 @@ public class Blocks{ regionSuffix = "-dark"; size = 3; + configurable = false; consumePower(2.5f); consumeLiquid(Liquids.hydrogen, 3f / 60f); consumeItems(with(Items.silicon, 50, Items.tungsten, 40)); @@ -6538,6 +6541,7 @@ public class Blocks{ researchCostMultipliers.put(Items.thorium, 0.2f); size = 5; + configurable = false; consumePower(4.5f); consumeLiquid(Liquids.nitrogen, 10f / 60f); consumeItems(with(Items.thorium, 80, Items.silicon, 100)); diff --git a/core/src/mindustry/world/blocks/distribution/ItemBridge.java b/core/src/mindustry/world/blocks/distribution/ItemBridge.java index 0c3d002eb4..16124cdb30 100644 --- a/core/src/mindustry/world/blocks/distribution/ItemBridge.java +++ b/core/src/mindustry/world/blocks/distribution/ItemBridge.java @@ -38,6 +38,7 @@ public class ItemBridge extends Block{ public float arrowSpacing = 4f, arrowOffset = 2f, arrowPeriod = 0.4f; public float arrowTimeScl = 6.2f; public float bridgeWidth = 6.5f; + /** If true, this bridge will not accept items or liquids when disabled. */ public boolean noAcceptDisabled = false; //for autolink @@ -434,7 +435,7 @@ public class ItemBridge extends Block{ @Override public boolean acceptItem(Building source, Item item){ - return hasItems && team == source.team && items.total() < itemCapacity && checkAccept(source, world.tile(link)); + return hasItems && team == source.team && items.total() < itemCapacity && checkAccept(source, world.tile(link)) && (!noAcceptDisabled || enabled); } @Override