From 361ed269079963af38efa6079c259abc13286e5a Mon Sep 17 00:00:00 2001
From: MEEP of Faith <meepmatthew@gmail.com>
Date: Mon, 16 Nov 2020 12:24:36 -0800
Subject: [PATCH] Lasers cannot and should not collide with anything.

---
 .../entities/bullet/ContinuousLaserBulletType.java        | 8 ++++----
 core/src/mindustry/entities/bullet/LaserBulletType.java   | 5 +++--
 .../src/mindustry/entities/bullet/ShrapnelBulletType.java | 4 +++-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/core/src/mindustry/entities/bullet/ContinuousLaserBulletType.java b/core/src/mindustry/entities/bullet/ContinuousLaserBulletType.java
index 172877be42..3e570c6309 100644
--- a/core/src/mindustry/entities/bullet/ContinuousLaserBulletType.java
+++ b/core/src/mindustry/entities/bullet/ContinuousLaserBulletType.java
@@ -30,15 +30,15 @@ public class ContinuousLaserBulletType extends BulletType{
         hitSize = 4;
         drawSize = 420f;
         lifetime = 16f;
-        keepVelocity = false;
-        pierce = true;
-        hittable = false;
         hitColor = colors[2];
-        collidesTiles = false;
         incendAmount = 1;
         incendSpread = 5;
         incendChance = 0.4f;
         lightColor = Color.orange;
+        keepVelocity = false;
+        collides = false;
+        pierce = true;
+        hittable = false;
         absorbable = false;
     }
 
diff --git a/core/src/mindustry/entities/bullet/LaserBulletType.java b/core/src/mindustry/entities/bullet/LaserBulletType.java
index 6d43baf95c..25e8fbfb67 100644
--- a/core/src/mindustry/entities/bullet/LaserBulletType.java
+++ b/core/src/mindustry/entities/bullet/LaserBulletType.java
@@ -23,16 +23,17 @@ public class LaserBulletType extends BulletType{
     public LaserBulletType(float damage){
         super(0.01f, damage);
 
-        keepVelocity = false;
         hitEffect = Fx.hitLancer;
         despawnEffect = Fx.none;
         shootEffect = Fx.hitLancer;
         smokeEffect = Fx.none;
-        collides = false;
         hitSize = 4;
         lifetime = 16f;
+        keepVelocity = false;
+        collides = false;
         pierce = true;
         hittable = false;
+        absorbable = false;
     }
 
     public LaserBulletType(){
diff --git a/core/src/mindustry/entities/bullet/ShrapnelBulletType.java b/core/src/mindustry/entities/bullet/ShrapnelBulletType.java
index 01a7ad2d7e..236ede8887 100644
--- a/core/src/mindustry/entities/bullet/ShrapnelBulletType.java
+++ b/core/src/mindustry/entities/bullet/ShrapnelBulletType.java
@@ -24,9 +24,11 @@ public class ShrapnelBulletType extends BulletType{
         shootEffect = smokeEffect = Fx.lightningShoot;
         lifetime = 10f;
         despawnEffect = Fx.none;
-        pierce = true;
         keepVelocity = false;
+        collides = false;
+        pierce = true;
         hittable = false;
+        absorbable = false;
     }
 
     @Override