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

(Should) prevent vela from setting fires to friendly tiles

Browse Source
This commit is contained in:
Leonwang4234
2020-10-16 08:54:29 -07:00
parent 69b7d15beb
commit 9b95b97568
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -161,11 +161,12 @@ public abstract class BulletType extends Content{
if(status == StatusEffects.burning) { if(status == StatusEffects.burning) {
Fires.create(tile.tile); Fires.create(tile.tile);
} }
hit(b);
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 {
hit(b);
} }
} }