From 867a6428594835e8933e8fd28a706eb73b100e03 Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 28 Jan 2020 13:44:06 -0500 Subject: [PATCH] Fixed #1460 --- core/src/mindustry/ai/Pathfinder.java | 3 +-- core/src/mindustry/game/Teams.java | 5 ++++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/core/src/mindustry/ai/Pathfinder.java b/core/src/mindustry/ai/Pathfinder.java index a16ac8f410..b40e3543da 100644 --- a/core/src/mindustry/ai/Pathfinder.java +++ b/core/src/mindustry/ai/Pathfinder.java @@ -33,8 +33,7 @@ public class Pathfinder implements Runnable{ /** handles task scheduling on the update thread. */ private TaskQueue queue = new TaskQueue(); /** current pathfinding thread */ - private @Nullable - Thread thread; + private @Nullable Thread thread; public Pathfinder(){ Events.on(WorldLoadEvent.class, event -> { diff --git a/core/src/mindustry/game/Teams.java b/core/src/mindustry/game/Teams.java index e4c7aa2c05..62479c66ec 100644 --- a/core/src/mindustry/game/Teams.java +++ b/core/src/mindustry/game/Teams.java @@ -17,6 +17,10 @@ public class Teams{ /** Active teams. */ private Array active = new Array<>(); + public Teams(){ + active.add(get(Team.crux)); + } + public @Nullable CoreEntity closestEnemyCore(float x, float y, Team team){ for(TeamData data : active){ if(areEnemies(team, data.team)){ @@ -85,7 +89,6 @@ public class Teams{ /** Returns whether {@param other} is an enemy of {@param #team}. */ public boolean areEnemies(Team team, Team other){ - //todo what about derelict? return team != other; }