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());
         }