Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed #2607 / Fixed #2604

Browse Source
This commit is contained in:
Anuken
2020-09-19 12:30:58 -04:00
parent e19e74cdc5
commit 9b0947a6e5
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/world/Tile.java
View File

@@ -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;

2
core/src/mindustry/world/blocks/defense/turrets/PowerTurret.java
View File

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

4
core/src/mindustry/world/blocks/liquid/ArmoredConduit.java
View File

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