From fc8eac404862f1df45e9d97c911f25bc25928b5d Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 10 Feb 2022 16:03:37 -0500
Subject: [PATCH] Better AI team check

---
 core/src/mindustry/game/Team.java                | 2 +-
 core/src/mindustry/type/unit/ErekirUnitType.java | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/core/src/mindustry/game/Team.java b/core/src/mindustry/game/Team.java
index 53366df21b..e39a6cdf24 100644
--- a/core/src/mindustry/game/Team.java
+++ b/core/src/mindustry/game/Team.java
@@ -107,7 +107,7 @@ public class Team implements Comparable<Team>{
 
     /** @return whether this team is solely comprised of AI, with no players. */
     public boolean isAI(){
-        return state.rules.waves && this == state.rules.waveTeam;
+        return (state.rules.waves || state.rules.attackMode) && this == state.rules.waveTeam;
     }
 
     public boolean isEnemy(Team other){
diff --git a/core/src/mindustry/type/unit/ErekirUnitType.java b/core/src/mindustry/type/unit/ErekirUnitType.java
index c29d121523..099ab679b8 100644
--- a/core/src/mindustry/type/unit/ErekirUnitType.java
+++ b/core/src/mindustry/type/unit/ErekirUnitType.java
@@ -1,6 +1,5 @@
 package mindustry.type.unit;
 
-import mindustry.*;
 import mindustry.ai.types.*;
 import mindustry.graphics.*;
 import mindustry.type.*;
@@ -15,6 +14,6 @@ public class ErekirUnitType extends UnitType{
         outlineColor = Pal.darkOutline;
         envDisabled = Env.space;
         coreUnitDock = true;
-        unitBasedDefaultController = u -> !playerControllable || u.team.isAI() || (Vars.state.rules.attackMode && u.team == Vars.state.rules.waveTeam) ? defaultController.get() : new CommandAI();
+        unitBasedDefaultController = u -> !playerControllable || u.team.isAI() ? defaultController.get() : new CommandAI();
     }
 }