Fixed #2373 / Fixed #2378

core/src/mindustry/entities/comp/BuildingComp.java

@@ -45,6 +45,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
     static final ObjectSet<Building> tmpTiles = new ObjectSet<>();
     static final Seq<Building> tempTileEnts = new Seq<>();
     static final Seq<Tile> tempTiles = new Seq<>();
+    static final float timeToUncontrol = 60f * 4;
     static int sleepingEntities = 0;
     
     @Import float x, y, health;
@@ -57,6 +58,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
     transient byte dump;
     transient int rotation;
     transient boolean enabled = true;
+    transient float enabledControlTime;
 
     PowerModule power;
     ItemModule items;
@@ -336,9 +338,9 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
     }
 
     public void created(){}
-    
+
     public boolean shouldConsume(){
-        return true;
+        return enabled;
     }
 
     public boolean productionValid(){
@@ -751,6 +753,16 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
     public void drawSelect(){
     }
 
+    public void drawDisabled(){
+        Draw.color(Color.scarlet);
+        Draw.alpha(0.8f);
+
+        float size = 6f;
+        Draw.rect(Icon.cancel.getRegion(), x, y, size, size);
+
+        Draw.reset();
+    }
+
     public void draw(){
         Draw.rect(block.region, x, y, block.rotate ? rotdeg() : 0);
 
@@ -1203,6 +1215,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
     public void control(LAccess type, double p1, double p2, double p3, double p4){
         if(type == LAccess.enabled){
             enabled = !Mathf.zero((float)p1);
+            enabledControlTime = timeToUncontrol;
         }
     }
 
@@ -1230,6 +1243,12 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
             timeScale = 1f;
         }
 
+        enabledControlTime -= Time.delta;
+
+        if(enabledControlTime <= 0){
+            enabled = true;
+        }
+
         if(sound != null){
             sound.update(x, y, shouldActiveSound());
         }

core/src/mindustry/graphics/OverlayRenderer.java

@@ -136,6 +136,9 @@ public class OverlayRenderer{
 
             if(tile != null && tile.team() == player.team()){
                 tile.drawSelect();
+                if(!tile.enabled){
+                   tile.drawDisabled();
+                }
 
                 if(Core.input.keyDown(Binding.rotateplaced) && tile.block().rotate && tile.interactable(player.team())){
                     control.input.drawArrow(tile.block(), tile.tileX(), tile.tileY(), tile.rotation, true);

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