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

Bugfix

Browse Source
This commit is contained in:
Anuken
2019-12-19 21:58:43 -05:00
parent 7a1f467f27
commit adb12dcbb8
4 changed files with 10329 additions and 10301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20626
core/assets/sprites/sprites.atlas
View File

File diff suppressed because it is too large Load Diff

BIN
core/assets/sprites/sprites4.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 134 KiB

After

Width:  |  Height:  |  Size: 925 KiB

BIN
core/assets/sprites/sprites5.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 924 KiB

After

Width:  |  Height:  |  Size: 134 KiB

4
core/src/io/anuke/mindustry/world/blocks/liquid/LiquidJunction.java
View File

@@ -39,8 +39,8 @@ public class LiquidJunction extends LiquidBlock{
public Tile getLiquidDestination(Tile tile, Tile source, Liquid liquid){ public Tile getLiquidDestination(Tile tile, Tile source, Liquid liquid){
int dir = source.relativeTo(tile.x, tile.y); int dir = source.relativeTo(tile.x, tile.y);
dir = (dir + 4) % 4; dir = (dir + 4) % 4;
Tile next = tile.getNearby(dir).link(); Tile next = tile.getNearbyLink(dir);
if(!next.block().acceptLiquid(next, tile, liquid, 0f) && !(next.block() instanceof LiquidJunction)){ if(next == null || !next.block().acceptLiquid(next, tile, liquid, 0f) && !(next.block() instanceof LiquidJunction)){
return tile; return tile;
} }
return next.block().getLiquidDestination(next, tile, liquid); return next.block().getLiquidDestination(next, tile, liquid);