Fixed missile shield pierce

2018-09-03 09:07:59 -04:00
parent 5129e2ea73
commit 019e22aff2
2 changed files with 10 additions and 2 deletions
--- a/core/src/io/anuke/mindustry/entities/bullet/Bullet.java
+++ b/core/src/io/anuke/mindustry/entities/bullet/Bullet.java
@@ -163,7 +163,7 @@ public class Bullet extends BulletEntity<BulletType> implements TeamTrait, SyncT

    @Override
    public boolean collides(SolidTrait other){
-        return type.collides && super.collides(other);
+        return type.collides && super.collides(other) && !supressCollision;
    }

    @Override
@@ -208,6 +208,14 @@ public class Bullet extends BulletEntity<BulletType> implements TeamTrait, SyncT
        supressCollision = false;
    }

+    @Override
+    protected void updateLife(){
+        if(time >= type.lifetime){
+            if(!supressCollision) type.despawned(this);
+            remove();
+        }
+    }
+
    @Override
    public void reset(){
        super.reset();