Merge branch '6.0' into crater

2020-04-16 20:30:13 +02:00
parent a05f4338c5 2f3a842f2e
commit 79a095faa8
5 changed files with 17 additions and 3 deletions
--- a/core/src/mindustry/entities/def/TileComp.java
+++ b/core/src/mindustry/entities/def/TileComp.java
@@ -990,6 +990,12 @@ abstract class TileComp implements Posc, Teamc, Healthc, Tilec, Timerc, QuadTree
        return null;
    }

+    @Replace
+    @Override
+    public boolean isValid(){
+        return tile.entity == this && !dead();
+    }
+
    @Override
    public void remove(){
        if(sound != null){