Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed #3250

Browse Source
This commit is contained in:
Anuken
2020-11-03 09:12:51 -05:00
parent 4a79f2fb4d
commit 6cde363d77
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/core/Control.java
View File

@@ -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();

2
core/src/mindustry/game/Schematics.java
View File

@@ -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;
}
}