From fbcbca6f2465d4a09e0c22c6df9780b1be6b7903 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 15 Feb 2019 18:59:19 -0500 Subject: [PATCH] crashfix --- core/src/io/anuke/mindustry/game/Teams.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/core/src/io/anuke/mindustry/game/Teams.java b/core/src/io/anuke/mindustry/game/Teams.java index d7d2e77177..a0a0922f8e 100644 --- a/core/src/io/anuke/mindustry/game/Teams.java +++ b/core/src/io/anuke/mindustry/game/Teams.java @@ -1,5 +1,6 @@ package io.anuke.mindustry.game; +import io.anuke.arc.collection.Array; import io.anuke.arc.collection.EnumSet; import io.anuke.arc.collection.ObjectSet; import io.anuke.mindustry.Vars; @@ -22,13 +23,7 @@ public class Teams{ /**Returns team data by type.*/ public TeamData get(Team team){ if(map[team.ordinal()] == null){ - //By default, a non-defined team will be enemies of everything. - //neutral teams (none) do not have any enemies. - Team[] others = new Team[Team.all.length-1]; - for(int i = 0, j = 0; i < Team.all.length; i++){ - if(Team.all[i] != team && team != Team.none && Team.all[i] != Team.none) others[j++] = Team.all[i]; - } - add(team, others); + add(team, Array.with(Team.all).select(t -> t != team && t != Team.none && team != Team.none).toArray(Team.class)); } return map[team.ordinal()]; }