From 2079cfaece10823554146920c6a85ba0732f7456 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 31 Oct 2020 13:03:19 -0400
Subject: [PATCH] Fixed #3208

---
 core/src/mindustry/entities/Lightning.java    |  2 +-
 .../mindustry/entities/bullet/BulletType.java | 20 +++++++++++--------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/core/src/mindustry/entities/Lightning.java b/core/src/mindustry/entities/Lightning.java
index fa943d6b88..61f42f2e72 100644
--- a/core/src/mindustry/entities/Lightning.java
+++ b/core/src/mindustry/entities/Lightning.java
@@ -38,7 +38,7 @@ public class Lightning{
         random.setSeed(seed);
         hit.clear();
 
-        BulletType hitCreate = hitter == null ? Bullets.damageLightning : hitter.type.lightningType;
+        BulletType hitCreate = hitter == null || hitter.type.lightningType == null ? Bullets.damageLightning : hitter.type.lightningType;
         Seq<Vec2> lines = new Seq<>();
         bhit = false;
 
diff --git a/core/src/mindustry/entities/bullet/BulletType.java b/core/src/mindustry/entities/bullet/BulletType.java
index 36b3893245..586d56001e 100644
--- a/core/src/mindustry/entities/bullet/BulletType.java
+++ b/core/src/mindustry/entities/bullet/BulletType.java
@@ -252,14 +252,6 @@ public abstract class BulletType extends Content{
     }
 
     public void init(Bullet b){
-        if(pierceCap >= 1){
-            pierce = true;
-            //pierceBuilding is not enabled by default, because a bullet may want to *not* pierce buildings
-        }
-
-        if(lightningType == null){
-            lightningType = !collidesAir ? Bullets.damageLightningGround : Bullets.damageLightning;
-        }
 
         if(killShooter && b.owner() instanceof Healthc){
             ((Healthc)b.owner()).kill();
@@ -289,6 +281,18 @@ public abstract class BulletType extends Content{
         }
     }
 
+    @Override
+    public void init(){
+        if(pierceCap >= 1){
+            pierce = true;
+            //pierceBuilding is not enabled by default, because a bullet may want to *not* pierce buildings
+        }
+
+        if(lightningType == null){
+            lightningType = !collidesAir ? Bullets.damageLightningGround : Bullets.damageLightning;
+        }
+    }
+
     @Override
     public ContentType getContentType(){
         return ContentType.bullet;