From aa80f06f7be0849d069044e52ae59a6a8e0308b1 Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 4 Aug 2021 19:02:36 -0400 Subject: [PATCH] Cleanup & bullet bugfixes --- core/src/mindustry/entities/Puddles.java | 4 +--- core/src/mindustry/entities/comp/BulletComp.java | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/core/src/mindustry/entities/Puddles.java b/core/src/mindustry/entities/Puddles.java index f0928db3ed..cf398dc1f6 100644 --- 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){ diff --git a/core/src/mindustry/entities/comp/BulletComp.java b/core/src/mindustry/entities/comp/BulletComp.java index 839e0b0c44..86b779b82d 100644 --- 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