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

prevent from breaking other things

Browse Source
This commit is contained in:
Leonwang4234
2020-10-08 19:27:01 -07:00
parent af5fd4551c
commit e73a813d69
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,7 +25,7 @@ public abstract class BulletType extends Content{
public float drawSize = 40f; public float drawSize = 40f;
public float drag = 0f; public float drag = 0f;
public boolean pierce, pierceBuilding; public boolean pierce, pierceBuilding;
public int pierceCap = 1; public int pierceCap = -1;
public Effect hitEffect, despawnEffect; public Effect hitEffect, despawnEffect;
/** Effect created when shooting. */ /** Effect created when shooting. */
@@ -236,7 +236,7 @@ public abstract class BulletType extends Content{
} }
public void init(Bullet b){ public void init(Bullet b){
if(pierceCap > 1) { if(pierceCap >= 1) {
pierce = true; pierce = true;
pierceBuilding = true; pierceBuilding = true;
} }

2
core/src/mindustry/entities/comp/BulletComp.java
View File

@@ -145,7 +145,7 @@ abstract class BulletComp implements Timedc, Damagec, Hitboxc, Teamc, Posc, Draw
}); });
} }
if(collided.size >= type.pierceCap) { if(type.pierceCap != -1 && collided.size >= type.pierceCap) {
remove(); remove();
} }
} }