Merge remote-tracking branch 'origin/master'

2020-10-31 12:03:38 -04:00
parent 9af8b64046 dc1c132e03
commit 04fcf06ad5
1 changed files with 1 additions and 1 deletions
--- a/core/src/mindustry/entities/bullet/BulletType.java
+++ b/core/src/mindustry/entities/bullet/BulletType.java
@@ -117,7 +117,7 @@ public abstract class BulletType extends Content{
    public float lightningCone = 360f;
    public float lightningAngle = 0f;
    /** The bullet created at lightning points. */
-    public BulletType lightningType;
+    public @Nullable BulletType lightningType = null;

    public float weaveScale = 1f;
    public float weaveMag = -1f;