Fixed #2607 / Fixed #2604

2020-09-19 12:30:58 -04:00
parent e19e74cdc5
commit 9b0947a6e5
3 changed files with 5 additions and 3 deletions
@@ -22,7 +22,7 @@ public class PowerTurret extends Turret{

    @Override
    public void init(){
-        consumes.powerCond(powerUse, entity -> ((TurretBuild)entity).target != null);
+        consumes.powerCond(powerUse, (TurretBuild entity) -> entity.target != null || (entity.logicControlled() && entity.logicShooting));
        super.init();
    }

@@ -33,8 +33,8 @@ public class ArmoredConduit extends Conduit{

        @Override
        public boolean acceptLiquid(Building source, Liquid liquid, float amount){
-            return super.acceptLiquid(source, liquid, amount) && (source.block instanceof Conduit) ||
-                Edges.getFacingEdge(source.tile(), tile).absoluteRelativeTo(tile.x, tile.y) == rotation;
+            return super.acceptLiquid(source, liquid, amount) && (source.block instanceof Conduit ||
+                source.tile.absoluteRelativeTo(tile.x, tile.y) == rotation);
        }
    }
 }