diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index 19606cf7f7..6275448402 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -421,6 +421,7 @@ public class UnitTypes implements ContentList{ armor = 7f; canBoost = true; landShake = 4f; + immunities = ObjectSet.with(StatusEffects.burning); commandLimit = 8; diff --git a/core/src/mindustry/entities/bullet/BulletType.java b/core/src/mindustry/entities/bullet/BulletType.java index 4d635ab2db..f6bfb18c78 100644 --- a/core/src/mindustry/entities/bullet/BulletType.java +++ b/core/src/mindustry/entities/bullet/BulletType.java @@ -161,16 +161,16 @@ public abstract class BulletType extends Content{ return healPercent <= 0.001f || tile.team != bullet.team || tile.healthf() < 1f; } - public void hitTile(Bullet b, Building tile, float initialHealth){ - if(makeFire && tile.team != b.team){ - Fires.create(tile.tile); + public void hitTile(Bullet b, Building build, float initialHealth){ + if(makeFire && build.team != b.team){ + Fires.create(build.tile); } - if(healPercent > 0f && tile.team == b.team && !(tile.block instanceof ConstructBlock)){ - Fx.healBlockFull.at(tile.x, tile.y, tile.block.size, Pal.heal); - tile.heal(healPercent / 100f * tile.maxHealth()); - }else if(tile.team != b.team){ - hit(b); + if(healPercent > 0f && build.team == b.team && !(build.block instanceof ConstructBlock)){ + Fx.healBlockFull.at(build.x, build.y, build.block.size, Pal.heal); + build.heal(healPercent / 100f * build.maxHealth()); + }else if(build.team != b.team){ + hit(b, build.x, build.y); } } diff --git a/core/src/mindustry/entities/bullet/RailBulletType.java b/core/src/mindustry/entities/bullet/RailBulletType.java index 8265f35e8b..4b13e3bd41 100644 --- a/core/src/mindustry/entities/bullet/RailBulletType.java +++ b/core/src/mindustry/entities/bullet/RailBulletType.java @@ -54,7 +54,7 @@ public class RailBulletType extends BulletType{ } @Override - public void hitTile(Bullet b, Building tile, float initialHealth){ - handle(b, tile, initialHealth); + public void hitTile(Bullet b, Building build, float initialHealth){ + handle(b, build, initialHealth); } }