Fixed compilation

core/src/mindustry/entities/Damage.java

@@ -88,7 +88,7 @@ public class Damage{
         tr.trns(angle, length);
         Intc2 collider = (cx, cy) -> {
             Tile tile = world.ltile(cx, cy);
-            if(tile != null && !collidedBlocks.contains(tile.pos()) && tile.entity != null && tile.getTeamID() != (int)team.id && tile.entity.collide(hitter)){
+            if(tile != null && !collidedBlocks.contains(tile.pos()) && tile.entity != null && tile.getTeamID() != team.id && tile.entity.collide(hitter)){
                 tile.entity.collision(hitter);
                 collidedBlocks.add(tile.pos());
                 hitter.getBulletType().hit(hitter, tile.worldx(), tile.worldy());

core/src/mindustry/entities/Units.java

@@ -1,15 +1,12 @@
 package mindustry.entities;
 
-import arc.struct.EnumSet;
-import arc.func.Cons;
-import arc.func.Boolf;
-import arc.math.Mathf;
-import arc.math.geom.Geometry;
-import arc.math.geom.Rectangle;
-import mindustry.entities.traits.TargetTrait;
+import arc.func.*;
+import arc.math.*;
+import arc.math.geom.*;
+import mindustry.entities.traits.*;
 import mindustry.entities.type.*;
-import mindustry.game.Team;
-import mindustry.world.Tile;
+import mindustry.game.*;
+import mindustry.world.*;
 
 import static mindustry.Vars.*;
 
@@ -157,7 +154,11 @@ public class Units{
 
     /** Iterates over all units in a rectangle. */
     public static void nearby(Team team, float x, float y, float width, float height, Cons<Unit> cons){
-        unitGroups[(int)team.id].intersect(x, y, width, height, cons);
+        unitGroup.intersect(x, y, width, height, u -> {
+            if(u.getTeam() == team){
+                cons.get(u);
+            }
+        });
         playerGroup.intersect(x, y, width, height, player -> {
             if(player.getTeam() == team){
                 cons.get(player);
@@ -167,8 +168,8 @@ public class Units{
 
     /** Iterates over all units in a circle around this position. */
     public static void nearby(Team team, float x, float y, float radius, Cons<Unit> cons){
-        unitGroups[(int)team.id].intersect(x - radius, y - radius, radius*2f, radius*2f, unit -> {
-            if(unit.withinDst(x, y, radius)){
+        unitGroup.intersect(x - radius, y - radius, radius*2f, radius*2f, unit -> {
+            if(unit.getTeam() == team && unit.withinDst(x, y, radius)){
                 cons.get(unit);
             }
         });
@@ -182,10 +183,7 @@ public class Units{
 
     /** Iterates over all units in a rectangle. */
     public static void nearby(float x, float y, float width, float height, Cons<Unit> cons){
-        for(Team team : Team.all){
-            unitGroups[(int)team.id].intersect(x, y, width, height, cons);
-        }
-
+        unitGroup.intersect(x, y, width, height, cons);
         playerGroup.intersect(x, y, width, height, cons);
     }
 
@@ -196,14 +194,14 @@ public class Units{
 
     /** Iterates over all units that are enemies of this team. */
     public static void nearbyEnemies(Team team, float x, float y, float width, float height, Cons<Unit> cons){
-        EnumSet<Team> targets = state.teams.enemiesOf(team);
-
-        for(Team other : targets){
-            unitGroups[(int)other.id].intersect(x, y, width, height, cons);
-        }
+        unitGroup.intersect(x, y, width, height, u -> {
+            if(state.teams.areEnemies(team, u.getTeam())){
+                cons.get(u);
+            }
+        });
 
         playerGroup.intersect(x, y, width, height, player -> {
-            if(targets.contains(player.getTeam())){
+            if(state.teams.areEnemies(team, player.getTeam())){
                 cons.get(player);
             }
         });
@@ -220,4 +218,8 @@ public class Units{
         playerGroup.all().each(cons);
     }
 
+    public static void each(Team team, Cons<BaseUnit> cons){
+        unitGroup.all().each(t -> t.getTeam() == team, cons);
+    }
+
 }

core/src/mindustry/entities/type/Unit.java

@@ -167,7 +167,7 @@ public abstract class Unit extends DestructibleEntity implements SaveTrait, Targ
     public void writeSave(DataOutput stream, boolean net) throws IOException{
         if(item.item == null) item.item = Items.copper;
 
-        stream.writeByte((int)team.id);
+        stream.writeByte(team.id);
         stream.writeBoolean(isDead());
         stream.writeFloat(net ? interpolator.target.x : x);
         stream.writeFloat(net ? interpolator.target.y : y);

core/src/mindustry/entities/type/base/BuilderDrone.java

@@ -114,12 +114,10 @@ public class BuilderDrone extends BaseDrone implements BuilderTrait{
     public BuilderDrone(){
         if(reset.check()){
             Events.on(BuildSelectEvent.class, event -> {
-                EntityGroup<BaseUnit> group = unitGroups[(int)event.team.id];
-
                 if(!(event.tile.entity instanceof BuildEntity)) return;
 
-                for(BaseUnit unit : group.all()){
-                    if(unit instanceof BuilderDrone){
+                for(BaseUnit unit : unitGroup.all()){
+                    if(unit instanceof BuilderDrone && unit.getTeam() == getTeam()){
                         BuilderDrone drone = (BuilderDrone)unit;
                         if(drone.isBuilding()){
                             //stop building if opposite building begins.