From e4f929a8510f0b628204da6a84c7d28991b47ce5 Mon Sep 17 00:00:00 2001 From: WayZer Date: Wed, 15 Feb 2023 22:02:32 +0800 Subject: [PATCH] Fix turret when cheating (#8291) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * (C/S) Fix ItemTurret ammo when `cheat`. * (C/S) Fix `TurretBuild.updateReload` NPE when `cheat` * Why `shouldConsume` cause `potentialEfficiency=0` --- core/src/mindustry/entities/comp/BuildingComp.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/mindustry/entities/comp/BuildingComp.java b/core/src/mindustry/entities/comp/BuildingComp.java index e7b5b8f617..767d4be608 100644 --- a/core/src/mindustry/entities/comp/BuildingComp.java +++ b/core/src/mindustry/entities/comp/BuildingComp.java @@ -1746,7 +1746,8 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc, public void updateConsumption(){ //everything is valid when cheating if(!block.hasConsumers || cheating()){ - potentialEfficiency = efficiency = optionalEfficiency = enabled && shouldConsume() && productionValid() ? 1f : 0f; + potentialEfficiency = enabled && productionValid() ? 1f : 0f; + efficiency = optionalEfficiency = shouldConsume() ? potentialEfficiency : 0f; updateEfficiencyMultiplier(); return; }