diff --git a/core/src/mindustry/world/Tile.java b/core/src/mindustry/world/Tile.java index f3b4526ad8..1eb8d8a729 100644 --- a/core/src/mindustry/world/Tile.java +++ b/core/src/mindustry/world/Tile.java @@ -8,6 +8,7 @@ import arc.scene.ui.*; import arc.scene.ui.layout.*; import arc.struct.*; import arc.util.ArcAnnotate.*; +import arc.util.*; import mindustry.annotations.Annotations.*; import mindustry.content.*; import mindustry.game.*; @@ -91,6 +92,7 @@ public class Tile implements Position, QuadTreeObject, Displayable{ if(y >= cy + 1) return 3; } }else{ //need offsets here + Log.info(""); if(Math.abs(x - cx + 0.5f) > Math.abs(y - cy + 0.5f)){ if(x+0.5f <= cx - 1) return 0; if(x+0.5f >= cx + 1) return 2; diff --git a/core/src/mindustry/world/blocks/defense/turrets/PowerTurret.java b/core/src/mindustry/world/blocks/defense/turrets/PowerTurret.java index c65d637859..847f624247 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/PowerTurret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/PowerTurret.java @@ -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(); } diff --git a/core/src/mindustry/world/blocks/liquid/ArmoredConduit.java b/core/src/mindustry/world/blocks/liquid/ArmoredConduit.java index 6327857637..6b8739b93a 100644 --- a/core/src/mindustry/world/blocks/liquid/ArmoredConduit.java +++ b/core/src/mindustry/world/blocks/liquid/ArmoredConduit.java @@ -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); } } }