From 4c8471c4a7856109c7e7ea0efd7bba5da68c9c83 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 10 Jun 2022 17:31:27 -0400
Subject: [PATCH] Fixed #7002

---
 core/src/mindustry/game/SectorInfo.java | 6 ++++--
 gradle.properties                       | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/core/src/mindustry/game/SectorInfo.java b/core/src/mindustry/game/SectorInfo.java
index 0e322cabd2..16e51f39a9 100644
--- a/core/src/mindustry/game/SectorInfo.java
+++ b/core/src/mindustry/game/SectorInfo.java
@@ -130,7 +130,9 @@ public class SectorInfo{
         //enable attack mode when there's a core.
         if(state.rules.waveTeam.core() != null){
             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.
@@ -138,7 +140,7 @@ public class SectorInfo{
             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;
         }
 
diff --git a/gradle.properties b/gradle.properties
index 79506edbd7..0eeb3fce98 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,4 +25,4 @@ org.gradle.caching=true
 #used for slow jitpack builds; TODO see if this actually works
 org.gradle.internal.http.socketTimeout=100000
 org.gradle.internal.http.connectionTimeout=100000
-archash=5a5b338905
+archash=f826256196