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

Fixed #7826

Browse Source
This commit is contained in:
Anuken
2022-11-05 08:56:44 -04:00
parent 3390c08d44
commit 8bba2459f2
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,8 +21,9 @@ public class ArmoredConduit extends Conduit{
public class ArmoredConduitBuild extends ConduitBuild{ public class ArmoredConduitBuild extends ConduitBuild{
@Override @Override
public boolean acceptLiquid(Building source, Liquid liquid){ public boolean acceptLiquid(Building source, Liquid liquid){
//TODO the proximity check is a super hacky solution for block-to-conduit through a junction...
return super.acceptLiquid(source, liquid) && (tile == null || source.block instanceof Conduit || source.block instanceof DirectionLiquidBridge || source.block instanceof LiquidJunction || return super.acceptLiquid(source, liquid) && (tile == null || source.block instanceof Conduit || source.block instanceof DirectionLiquidBridge || source.block instanceof LiquidJunction ||
source.tile.absoluteRelativeTo(tile.x, tile.y) == rotation); source.tile.absoluteRelativeTo(tile.x, tile.y) == rotation || !source.proximity.contains(this));
} }
} }
} }

3
core/src/mindustry/world/blocks/liquid/LiquidJunction.java
View File

@@ -39,8 +39,7 @@ public class LiquidJunction extends LiquidBlock{
public Building getLiquidDestination(Building source, Liquid liquid){ public Building getLiquidDestination(Building source, Liquid liquid){
if(!enabled) return this; if(!enabled) return this;
int dir = source.relativeTo(tile.x, tile.y); int dir = (source.relativeTo(tile.x, tile.y) + 4) % 4;
dir = (dir + 4) % 4;
Building next = nearby(dir); Building next = nearby(dir);
if(next == null || (!next.acceptLiquid(this, liquid) && !(next.block instanceof LiquidJunction))){ if(next == null || (!next.acceptLiquid(this, liquid) && !(next.block instanceof LiquidJunction))){
return this; return this;