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

Cleanup

Browse Source
This commit is contained in:
Anuken
2021-08-22 00:36:25 -04:00
parent 789fcac439
commit 55270996ff
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/entities/EntityCollisions.java
View File

@@ -135,7 +135,7 @@ public class EntityCollisions{
public static boolean waterSolid(int x, int y){ public static boolean waterSolid(int x, int y){
Tile tile = world.tile(x, y); Tile tile = world.tile(x, y);
return tile == null || (tile.solid() || !tile.floor().isLiquid); return tile == null || tile.solid() || !tile.floor().isLiquid;
} }
public static boolean solid(int x, int y){ public static boolean solid(int x, int y){

3
core/src/mindustry/entities/comp/WaterMoveComp.java
View File

@@ -75,8 +75,7 @@ abstract class WaterMoveComp implements Posc, Velc, Hitboxc, Flyingc, Unitc{
@Replace @Replace
@Override @Override
public boolean onSolid(){ public boolean onSolid(){
Tile tile = tileOn(); return EntityCollisions.waterSolid(tileX(), tileY());
return tile == null || tile.solid() || EntityCollisions.waterSolid(tile.x, tile.y);
} }
@Replace @Replace