Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed #1460

Browse Source
This commit is contained in:
Anuken
2020-01-28 13:44:06 -05:00
parent 89e1c5afc0
commit 867a642859
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/mindustry/ai/Pathfinder.java
View File

@@ -33,8 +33,7 @@ public class Pathfinder implements Runnable{
/** handles task scheduling on the update thread. */ /** handles task scheduling on the update thread. */
private TaskQueue queue = new TaskQueue(); private TaskQueue queue = new TaskQueue();
/** current pathfinding thread */ /** current pathfinding thread */
private @Nullable private @Nullable Thread thread;
Thread thread;
public Pathfinder(){ public Pathfinder(){
Events.on(WorldLoadEvent.class, event -> { Events.on(WorldLoadEvent.class, event -> {

5
core/src/mindustry/game/Teams.java
View File

@@ -17,6 +17,10 @@ public class Teams{
/** Active teams. */ /** Active teams. */
private Array<TeamData> active = new Array<>(); private Array<TeamData> active = new Array<>();
public Teams(){
active.add(get(Team.crux));
}
public @Nullable CoreEntity closestEnemyCore(float x, float y, Team team){ public @Nullable CoreEntity closestEnemyCore(float x, float y, Team team){
for(TeamData data : active){ for(TeamData data : active){
if(areEnemies(team, data.team)){ if(areEnemies(team, data.team)){
@@ -85,7 +89,6 @@ public class Teams{
/** Returns whether {@param other} is an enemy of {@param #team}. */ /** Returns whether {@param other} is an enemy of {@param #team}. */
public boolean areEnemies(Team team, Team other){ public boolean areEnemies(Team team, Team other){
//todo what about derelict?
return team != other; return team != other;
} }