This commit is contained in:
Anuken 2020-08-19 11:15:19 -04:00
parent 9470f1f99f
commit 8fcab2d637
9 changed files with 9 additions and 9 deletions

View file

@ -45,7 +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 final float timeToUncontrol = 60f * 6;
static int sleepingEntities = 0;
@Import float x, y, health;

View file

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

View file

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

View file

@ -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)) && super.shouldConsume();
return (outputLiquid == null || !(liquids.get(outputLiquid.liquid) >= liquidCapacity - 0.001f)) && enabled;
}
@Override

View file

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

View file

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

View file

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

View file

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

View file

@ -223,7 +223,7 @@ public class UnitFactory extends UnitBlock{
if(currentPlan != -1 && !Units.canCreate(team, plans[currentPlan].unit)){
return false;
}
return super.shouldConsume();
return enabled;
}
@Override