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

Fixed #7002

Browse Source
This commit is contained in:
Anuken
2022-06-10 17:31:27 -04:00
parent 8d27d70bc2
commit 4c8471c4a7
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -130,7 +130,9 @@ public class SectorInfo{
//enable attack mode when there's a core. //enable attack mode when there's a core.
if(state.rules.waveTeam.core() != null){ if(state.rules.waveTeam.core() != null){
attack = true; attack = true;
winWave = 0; if(!state.rules.sector.planet.allowWaves){
winWave = 0;
}
} }
//if there are infinite waves and no win wave, add a win wave. //if there are infinite waves and no win wave, add a win wave.
@@ -138,7 +140,7 @@ public class SectorInfo{
winWave = 30; winWave = 30;
} }
if(state.rules.sector != null && state.rules.sector.preset != null && state.rules.sector.preset.captureWave > 0){ if(state.rules.sector != null && state.rules.sector.preset != null && state.rules.sector.preset.captureWave > 0 && !state.rules.sector.planet.allowWaves){
winWave = state.rules.sector.preset.captureWave; winWave = state.rules.sector.preset.captureWave;
} }

2
gradle.properties
View File

@@ -25,4 +25,4 @@ org.gradle.caching=true
#used for slow jitpack builds; TODO see if this actually works #used for slow jitpack builds; TODO see if this actually works
org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.socketTimeout=100000
org.gradle.internal.http.connectionTimeout=100000 org.gradle.internal.http.connectionTimeout=100000
archash=5a5b338905 archash=f826256196