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

Fixed #4164 / Fixed #4159

Browse Source
This commit is contained in:
Anuken
2020-12-29 10:13:27 -05:00
parent add3fd9fb3
commit 6357c17f8a
6 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/mindustry/world/blocks/Autotiler.java
View File

@@ -219,9 +219,8 @@ public interface Autotiler{
/**
* Check if a position is facing the secondary position at a rotation
*
* @param tile The origin tile that is or is not facing the destinated `otherblock`
* @param tile The origin tile that is or is not facing the `otherblock`
* @param rotation The rotation of the tile on (x, y)
*
* @param otherx The x coordinate of position 2
* @param othery The y coordinate of position 2
* @return whether this tile is looking at the other tile.

3
core/src/mindustry/world/blocks/distribution/ArmoredConveyor.java
View File

@@ -12,7 +12,8 @@ public class ArmoredConveyor extends Conveyor{
@Override
public boolean blends(Tile tile, int rotation, int otherx, int othery, int otherrot, Block otherblock){
return otherblock.outputsItems() && blendsArmored(tile, rotation, otherx, othery, otherrot, otherblock);
return (otherblock.outputsItems() && blendsArmored(tile, rotation, otherx, othery, otherrot, otherblock)) ||
(lookingAt(tile, rotation, otherx, othery, otherblock) && otherblock.hasItems);
}
public class ArmoredConveyorBuild extends ConveyorBuild{

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

@@ -16,7 +16,8 @@ public class ArmoredConduit extends Conduit{
@Override
public boolean blends(Tile tile, int rotation, int otherx, int othery, int otherrot, Block otherblock){
return otherblock.outputsLiquid && blendsArmored(tile, rotation, otherx, othery, otherrot, otherblock);
return (otherblock.outputsLiquid && blendsArmored(tile, rotation, otherx, othery, otherrot, otherblock)) ||
(lookingAt(tile, rotation, otherx, othery, otherblock) && otherblock.hasLiquids);
}
public class ArmoredConduitBuild extends ConduitBuild{
@@ -24,7 +25,7 @@ public class ArmoredConduit extends Conduit{
public void draw(){
super.draw();
// draw the cap when a conduit would normally leak
//draw the cap when a conduit would normally leak
Building next = front();
if(next != null && next.team == team && next.block.hasLiquids) return;