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

formatting

Browse Source 
Why do I always make these mistakes?

And I saw that I did the same thing in my incendiary-fire PR too...
This commit is contained in:
Leonwang4234
2020-10-30 09:04:44 -07:00
parent 9b95b97568
commit de483990ef
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,9 +37,9 @@ public class Lightning{
hit.clear(); hit.clear();
BulletType bulletType; BulletType bulletType;
if(hitter != null && hitter.type.lightningHitter != null) { if(hitter != null && hitter.type.lightningHitter != null){
bulletType = hitter.type.lightningHitter; bulletType = hitter.type.lightningHitter;
} else { }else{
bulletType = hitter != null && !hitter.type.collidesAir ? Bullets.damageLightningGround : Bullets.damageLightning; bulletType = hitter != null && !hitter.type.collidesAir ? Bullets.damageLightningGround : Bullets.damageLightning;
} }

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

@@ -158,14 +158,14 @@ public abstract class BulletType extends Content{
} }
public void hitTile(Bullet b, Building tile, float initialHealth){ public void hitTile(Bullet b, Building tile, float initialHealth){
if(status == StatusEffects.burning) { if(status == StatusEffects.burning){
Fires.create(tile.tile); Fires.create(tile.tile);
} }
if(healPercent > 0f && tile.team == b.team && !(tile.block instanceof ConstructBlock)){ if(healPercent > 0f && tile.team == b.team && !(tile.block instanceof ConstructBlock)){
Fx.healBlockFull.at(tile.x, tile.y, tile.block.size, Pal.heal); Fx.healBlockFull.at(tile.x, tile.y, tile.block.size, Pal.heal);
tile.heal(healPercent / 100f * tile.maxHealth()); tile.heal(healPercent / 100f * tile.maxHealth());
} else { }else{
hit(b); hit(b);
} }
} }