From 4b9bcfb014fa9531f849b138ce716ba0bffcfd41 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 3 May 2019 10:26:56 -0400 Subject: [PATCH] Crash fix --- core/src/io/anuke/mindustry/game/Saves.java | 2 +- .../src/io/anuke/mindustry/world/blocks/units/UnitFactory.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/core/src/io/anuke/mindustry/game/Saves.java b/core/src/io/anuke/mindustry/game/Saves.java index 3078637c01..718d3a7df4 100644 --- a/core/src/io/anuke/mindustry/game/Saves.java +++ b/core/src/io/anuke/mindustry/game/Saves.java @@ -224,7 +224,7 @@ public class Saves{ } public Zone getZone(){ - return content.getByID(ContentType.zone, meta.rules.zone); + return meta == null || meta.rules == null ? null : content.getByID(ContentType.zone, meta.rules.zone); } public int getBuild(){ diff --git a/core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java b/core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java index bb4075e762..98fccd1af8 100644 --- a/core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java +++ b/core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java @@ -161,7 +161,7 @@ public class UnitFactory extends Block{ //player-made spawners have default behavior if(entity.cons.valid() || tile.isEnemyCheat()){ - entity.time += entity.delta() * entity.speedScl * Vars.state.rules.unitBuildSpeedMultiplier; + entity.time += entity.delta() * entity.speedScl * Vars.state.rules.unitBuildSpeedMultiplier * entity.power.satisfaction; entity.buildTime += entity.delta() * entity.power.satisfaction * Vars.state.rules.unitBuildSpeedMultiplier; entity.speedScl = Mathf.lerpDelta(entity.speedScl, 1f, 0.05f); }else{ @@ -199,6 +199,7 @@ public class UnitFactory extends Block{ float buildTime; float time; float speedScl; + //TODO remove next breaking release float warmup; //only for enemy spawners int spawned;