Fixed #1320
This commit is contained in:
@@ -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(){
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
org.gradle.daemon=true
|
||||
org.gradle.jvmargs=-Xms256m -Xmx1024m
|
||||
archash=b3d3fc19560148f16b58ac7e04903f9db4f56912
|
||||
archash=919a8f30e16d6b3d8fa96d438c5ff621899b4368
|
||||
|
||||
Reference in New Issue
Block a user