From 9b95b975683d263ffa5477bb27bdc1a7d2cb9b42 Mon Sep 17 00:00:00 2001 From: Leonwang4234 <62972692+Leonwang4234@users.noreply.github.com> Date: Fri, 16 Oct 2020 08:54:29 -0700 Subject: [PATCH] (Should) prevent vela from setting fires to friendly tiles --- core/src/mindustry/entities/bullet/BulletType.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/entities/bullet/BulletType.java b/core/src/mindustry/entities/bullet/BulletType.java index 87d6ceadd3..85bf80f7f5 100644 --- a/core/src/mindustry/entities/bullet/BulletType.java +++ b/core/src/mindustry/entities/bullet/BulletType.java @@ -161,11 +161,12 @@ public abstract class BulletType extends Content{ if(status == StatusEffects.burning) { Fires.create(tile.tile); } - hit(b); - + 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 { + hit(b); } }