From 901c23f2955d4874dd772f88f7fc79cff9120483 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 13 Dec 2020 18:01:22 -0500 Subject: [PATCH] Fixed #3969 --- core/src/mindustry/ai/types/FormationAI.java | 2 +- core/src/mindustry/entities/comp/FlyingComp.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/ai/types/FormationAI.java b/core/src/mindustry/ai/types/FormationAI.java index 026d323488..39b0c81cde 100644 --- a/core/src/mindustry/ai/types/FormationAI.java +++ b/core/src/mindustry/ai/types/FormationAI.java @@ -33,7 +33,7 @@ public class FormationAI extends AIController implements FormationMember{ } if(unit.type.canBoost){ - unit.elevation = Mathf.approachDelta(unit.elevation, !unit.canPassOn() ? 1f : leader.type.canBoost ? leader.elevation : 0f, 0.08f); + unit.elevation = Mathf.approachDelta(unit.elevation, unit.onSolid() ? 1f : leader.type.canBoost ? leader.elevation : 0f, 0.08f); } unit.controlWeapons(true, leader.isShooting); diff --git a/core/src/mindustry/entities/comp/FlyingComp.java b/core/src/mindustry/entities/comp/FlyingComp.java index 43955b75a1..395d517347 100644 --- a/core/src/mindustry/entities/comp/FlyingComp.java +++ b/core/src/mindustry/entities/comp/FlyingComp.java @@ -68,7 +68,7 @@ abstract class FlyingComp implements Posc, Velc, Healthc, Hitboxc{ if(isFlying() != wasFlying){ if(wasFlying){ if(tileOn() != null){ - Fx.unitLand.at(x, y, floorOn().isLiquid ? 1f : 0.5f, floorOn().mapColor); + Fx.unitLand.at(x, y, floorOn().isLiquid ? 1f : 0.5f, tileOn().floor().mapColor); } }