Cleanup & bullet bugfixes

2021-08-04 19:02:36 -04:00
parent dd738a0108
commit aa80f06f7b
2 changed files with 2 additions and 4 deletions
--- a/core/src/mindustry/entities/Puddles.java
+++ b/core/src/mindustry/entities/Puddles.java
@@ -45,9 +45,7 @@ public class Puddles{
            return;
        }

-        if(tile.floor().solid){
-            return;
-        }
+        if(tile.floor().solid) return;

        Puddle p = map.get(tile.pos());
        if(p == null){
--- a/core/src/mindustry/entities/comp/BulletComp.java
+++ b/core/src/mindustry/entities/comp/BulletComp.java
@@ -81,7 +81,7 @@ abstract class BulletComp implements Timedc, Damagec, Hitboxc, Teamc, Posc, Draw
    }

    public boolean hasCollided(int id){
-        return collided.size != 0 && !collided.contains(id);
+        return collided.size != 0 && collided.contains(id);
    }

    @Replace