Fixed turrets firing without power as players

This commit is contained in:
Anuken
2020-10-04 09:58:53 -04:00
parent c4fb84c359
commit 605a370679
5 changed files with 8 additions and 3 deletions
@@ -20,7 +20,7 @@ public class PowerTurret extends Turret{
@Override
public void init(){
consumes.powerCond(powerUse, (TurretBuild entity) -> entity.target != null || (entity.logicControlled() && entity.logicShooting));
consumes.powerCond(powerUse, TurretBuild::isActive);
super.init();
}
@@ -195,6 +195,10 @@ public abstract class Turret extends Block{
return logicControlTime > 0;
}
public boolean isActive(){
return target != null || (logicControlled() && logicShooting) || (isControlled() && unit.isShooting());
}
@Override
public void draw(){
Draw.rect(baseRegion, x, y);