More bugfixes

2020-08-18 13:22:06 -04:00
parent 4d83221c76
commit ca864655d1
3 changed files with 7 additions and 2 deletions
--- a/core/src/mindustry/entities/comp/WaterMoveComp.java
+++ b/core/src/mindustry/entities/comp/WaterMoveComp.java
@@ -10,6 +10,7 @@ import mindustry.entities.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.type.*;
+import mindustry.world.*;
 import mindustry.world.blocks.environment.*;

 import static mindustry.Vars.*;
@@ -95,7 +96,8 @@ abstract class WaterMoveComp implements Posc, Velc, Hitboxc, Flyingc, Unitc{
    }

    public boolean onLiquid(){
-        return floorOn().isLiquid;
+        Tile tile = tileOn();
+        return tile != null && tile.floor().isLiquid;
    }
 }