From 6cde363d77bfd4070fd1bffd849d1d537949f0c0 Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 3 Nov 2020 09:12:51 -0500 Subject: [PATCH] Fixed #3250 --- core/src/mindustry/core/Control.java | 2 +- core/src/mindustry/game/Schematics.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/core/Control.java b/core/src/mindustry/core/Control.java index 30f9eae747..4aae84a735 100644 --- a/core/src/mindustry/core/Control.java +++ b/core/src/mindustry/core/Control.java @@ -288,7 +288,7 @@ public class Control implements ApplicationListener, Loadable{ state.wave = 1; //reset win wave?? - state.rules.winWave = sector.preset != null ? sector.preset.captureWave : 40; + state.rules.winWave = state.rules.attackMode ? -1 : sector.preset != null ? sector.preset.captureWave : 40; //kill all units, since they should be dead anwyay Groups.unit.clear(); diff --git a/core/src/mindustry/game/Schematics.java b/core/src/mindustry/game/Schematics.java index 8fb2a01d23..cead506777 100644 --- a/core/src/mindustry/game/Schematics.java +++ b/core/src/mindustry/game/Schematics.java @@ -434,7 +434,7 @@ public class Schematics implements Loadable{ if(check && !(st.block instanceof CoreBlock)){ seq.clear(); tile.getLinkedTilesAs(st.block, seq); - if(seq.contains(t -> !t.block().alwaysReplace)){ + if(seq.contains(t -> !t.block().alwaysReplace && !t.synthetic())){ return; } }