Fixed #2373 / Fixed #2378

core/src/mindustry/world/blocks/distribution/ItemBridge.java

@@ -391,7 +391,7 @@ public class ItemBridge extends Block{
 
         @Override
         public boolean shouldConsume(){
-            return linkValid(tile, world.tile(link));
+            return linkValid(tile, world.tile(link)) && super.shouldConsume();
         }
 
         @Override

core/src/mindustry/world/blocks/production/Drill.java

@@ -217,7 +217,7 @@ public class Drill extends Block{
 
         @Override
         public boolean shouldConsume(){
-            return items.total() < itemCapacity;
+            return items.total() < itemCapacity && super.shouldConsume();
         }
 
         @Override

core/src/mindustry/world/blocks/production/GenericCrafter.java

@@ -93,7 +93,7 @@ public class GenericCrafter extends Block{
             if(outputItem != null && items.get(outputItem.item) >= itemCapacity){
                 return false;
             }
-            return outputLiquid == null || !(liquids.get(outputLiquid.liquid) >= liquidCapacity - 0.001f);
+            return (outputLiquid == null || !(liquids.get(outputLiquid.liquid) >= liquidCapacity - 0.001f)) && super.shouldConsume();
         }
 
         @Override

core/src/mindustry/world/blocks/production/Pump.java

@@ -108,7 +108,7 @@ public class Pump extends LiquidBlock{
 
         @Override
         public boolean shouldConsume(){
-            return liquidDrop != null && liquids.get(liquidDrop) < liquidCapacity - 0.01f;
+            return liquidDrop != null && liquids.get(liquidDrop) < liquidCapacity - 0.01f && super.shouldConsume();
         }
 
         @Override

core/src/mindustry/world/blocks/production/Separator.java

@@ -71,7 +71,7 @@ public class Separator extends Block{
                     total -= items.get(stack.item);
                 }
             }
-            return total < itemCapacity;
+            return total < itemCapacity && super.shouldConsume();
         }
 
         @Override

core/src/mindustry/world/blocks/production/SolidPump.java

@@ -97,7 +97,7 @@ public class SolidPump extends Pump{
 
         @Override
         public boolean shouldConsume(){
-            return liquids.get(result) < liquidCapacity - 0.01f;
+            return liquids.get(result) < liquidCapacity - 0.01f && super.shouldConsume();
         }
 
         @Override

core/src/mindustry/world/blocks/storage/StorageBlock.java

@@ -42,7 +42,7 @@ public abstract class StorageBlock extends Block{
 
         @Override
         public boolean canPickup(){
-            return linkedCore != null;
+            return linkedCore == null;
         }
     }
 }

core/src/mindustry/world/blocks/units/RepairPoint.java

@@ -115,7 +115,7 @@ public class RepairPoint extends Block{
 
         @Override
         public boolean shouldConsume(){
-            return target != null;
+            return target != null && super.shouldConsume();
         }
     }
 }

core/src/mindustry/world/modules/ConsumeModule.java

@@ -63,11 +63,11 @@ public class ConsumeModule extends BlockModule{
     }
 
     public boolean valid(){
-        return valid && entity.shouldConsume();
+        return valid && entity.shouldConsume() && entity.enabled;
     }
 
     public boolean optionalValid(){
-        return valid() && optionalValid;
+        return valid() && optionalValid && entity.enabled;
     }
 
     @Override