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

Fixed #1320

Browse Source
This commit is contained in:
Anuken
2020-01-04 15:12:29 -05:00
parent ea66d9a92f
commit 8af3b877b5
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/game/Teams.java
View File

@@ -80,7 +80,7 @@ public class Teams{
/** Returns whether a team is active, e.g. whether it has any cores remaining. */ /** Returns whether a team is active, e.g. whether it has any cores remaining. */
public boolean isActive(Team team){ public boolean isActive(Team team){
//the enemy wave team is always active //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}. */ /** Returns whether {@param other} is an enemy of {@param #team}. */
@@ -150,7 +150,7 @@ public class Teams{
} }
public boolean active(){ 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(){ public boolean hasCore(){

2
gradle.properties
View File

@@ -1,3 +1,3 @@
org.gradle.daemon=true org.gradle.daemon=true
org.gradle.jvmargs=-Xms256m -Xmx1024m org.gradle.jvmargs=-Xms256m -Xmx1024m
archash=b3d3fc19560148f16b58ac7e04903f9db4f56912 archash=919a8f30e16d6b3d8fa96d438c5ff621899b4368