diff --git a/build.gradle b/build.gradle
index a75b33dc31..92b783b925 100644
--- a/build.gradle
+++ b/build.gradle
@@ -26,7 +26,7 @@ allprojects {
         appName = 'Mindustry'
         gdxVersion = '1.9.8'
         roboVMVersion = '2.3.0'
-        uCoreVersion = 'b6c84cdaad80c58267bdb0fc91d7197bb2252247'
+        uCoreVersion = 'f311d4683c798c2b0e5967938edb7a52a1294119'
 
         getVersionString = {
             String buildVersion = getBuildVersion()
diff --git a/core/src/io/anuke/mindustry/entities/bullet/Bullet.java b/core/src/io/anuke/mindustry/entities/bullet/Bullet.java
index fd63c9bbec..b406c27e10 100644
--- 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();