From 8af3b877b58e55800f59866b52f0e90b279aeb8a Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 4 Jan 2020 15:12:29 -0500
Subject: [PATCH] Fixed #1320

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

diff --git a/core/src/mindustry/game/Teams.java b/core/src/mindustry/game/Teams.java
index dc44d47240..e4fa1f1ef3 100644
--- a/core/src/mindustry/game/Teams.java
+++ b/core/src/mindustry/game/Teams.java
@@ -80,7 +80,7 @@ public class Teams{
     /** Returns whether a team is active, e.g. whether it has any cores remaining. */
     public boolean isActive(Team team){
         //the enemy wave team is always active
-        return team == state.rules.waveTeam || get(team).cores.size > 0;
+        return get(team).active();
     }
 
     /** Returns whether {@param other} is an enemy of {@param #team}. */
@@ -150,7 +150,7 @@ public class Teams{
         }
 
         public boolean active(){
-            return team == state.rules.waveTeam || cores.size > 0;
+            return (team == state.rules.waveTeam && state.rules.waves) || cores.size > 0;
         }
 
         public boolean hasCore(){
diff --git a/gradle.properties b/gradle.properties
index 13b714378d..015c89b285 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xms256m -Xmx1024m
-archash=b3d3fc19560148f16b58ac7e04903f9db4f56912
+archash=919a8f30e16d6b3d8fa96d438c5ff621899b4368