Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed #3208

Browse Source
This commit is contained in:
Anuken
2020-10-31 13:03:19 -04:00
parent 04fcf06ad5
commit 2079cfaece
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/entities/Lightning.java
View File

@@ -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;

20
core/src/mindustry/entities/bullet/BulletType.java
View File

@@ -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;