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

Fixed capture wave being set to 0 in some situations

Browse Source
This commit is contained in:
Anuken
2020-12-05 18:03:21 -05:00
parent b0f62f25e6
commit d61bb66418
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

@@ -341,7 +341,7 @@ public class Control implements ApplicationListener, Loadable{
state.rules.waves = true;
//reset win wave??
state.rules.winWave = state.rules.attackMode ? -1 : sector.preset != null ? sector.preset.captureWave : state.rules.winWave > state.wave ? state.rules.winWave : 40;
state.rules.winWave = state.rules.attackMode ? -1 : sector.preset != null && sector.preset.captureWave > 0 ? sector.preset.captureWave : state.rules.winWave > state.wave ? state.rules.winWave : 40;
//if there's still an enemy base left, fix it
if(state.rules.attackMode){

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

@@ -130,7 +130,7 @@ public class SectorInfo{
}
//if there are infinite waves and no win wave, add a win wave.
if(waves && winWave <= 0 && !attack){
if(winWave <= 0 && !attack){
winWave = 30;
}