From 88d1165909e300a59c3990a55a516868f1e4c416 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 23 Oct 2021 09:26:30 -0400 Subject: [PATCH] Fixed #6220 / Fixed #6217 --- core/src/mindustry/graphics/g3d/PlanetMesh.java | 3 +-- .../src/mindustry/world/blocks/defense/OverdriveProjector.java | 2 +- core/src/mindustry/world/blocks/units/Reconstructor.java | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/core/src/mindustry/graphics/g3d/PlanetMesh.java b/core/src/mindustry/graphics/g3d/PlanetMesh.java index 0eaa18adbb..321cd85e31 100644 --- a/core/src/mindustry/graphics/g3d/PlanetMesh.java +++ b/core/src/mindustry/graphics/g3d/PlanetMesh.java @@ -19,8 +19,7 @@ public abstract class PlanetMesh implements GenericMesh{ public PlanetMesh(){} - /** Should be overridden to set up any shader parameters such as planet position, normals, etc. - * @param params*/ + /** Should be overridden to set up any shader parameters such as planet position, normals, etc. */ public void preRender(PlanetParams params){ } diff --git a/core/src/mindustry/world/blocks/defense/OverdriveProjector.java b/core/src/mindustry/world/blocks/defense/OverdriveProjector.java index 95daea2e29..3dc1c19bf7 100644 --- a/core/src/mindustry/world/blocks/defense/OverdriveProjector.java +++ b/core/src/mindustry/world/blocks/defense/OverdriveProjector.java @@ -109,7 +109,7 @@ public class OverdriveProjector extends Block{ float realRange = range + phaseHeat * phaseRangeBoost; charge = 0f; - indexer.eachBlock(this, realRange, other -> true, other -> other.applyBoost(realBoost(), reload + 1f)); + indexer.eachBlock(this, realRange, other -> other.block.canOverdrive, other -> other.applyBoost(realBoost(), reload + 1f)); } if(timer(timerUse, useTime) && efficiency() > 0 && consValid()){ diff --git a/core/src/mindustry/world/blocks/units/Reconstructor.java b/core/src/mindustry/world/blocks/units/Reconstructor.java index b73b51547c..22a6155998 100644 --- a/core/src/mindustry/world/blocks/units/Reconstructor.java +++ b/core/src/mindustry/world/blocks/units/Reconstructor.java @@ -231,7 +231,7 @@ public class Reconstructor extends UnitBlock{ @Override public boolean shouldConsume(){ - return constructing(); + return constructing() && enabled; } public UnitType unit(){