From 55270996ff189e943246147cbe5cae4f9e7efcbf Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 22 Aug 2021 00:36:25 -0400
Subject: [PATCH] Cleanup

---
 core/src/mindustry/entities/EntityCollisions.java   | 2 +-
 core/src/mindustry/entities/comp/WaterMoveComp.java | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/core/src/mindustry/entities/EntityCollisions.java b/core/src/mindustry/entities/EntityCollisions.java
index e6651a420f..a503241116 100644
--- a/core/src/mindustry/entities/EntityCollisions.java
+++ b/core/src/mindustry/entities/EntityCollisions.java
@@ -135,7 +135,7 @@ public class EntityCollisions{
 
     public static boolean waterSolid(int x, int 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){
diff --git a/core/src/mindustry/entities/comp/WaterMoveComp.java b/core/src/mindustry/entities/comp/WaterMoveComp.java
index 06434ccecb..ce008279cf 100644
--- a/core/src/mindustry/entities/comp/WaterMoveComp.java
+++ b/core/src/mindustry/entities/comp/WaterMoveComp.java
@@ -75,8 +75,7 @@ abstract class WaterMoveComp implements Posc, Velc, Hitboxc, Flyingc, Unitc{
     @Replace
     @Override
     public boolean onSolid(){
-        Tile tile = tileOn();
-        return tile == null || tile.solid() || EntityCollisions.waterSolid(tile.x, tile.y);
+        return EntityCollisions.waterSolid(tileX(), tileY());
     }
 
     @Replace