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

Bugfixes

Browse Source
This commit is contained in:
Anuken
2020-11-13 17:33:32 -05:00
parent cf71356bdb
commit 04c465c8f0
8 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
core/src/mindustry/ai/BlockIndexer.java
View File

@@ -208,16 +208,30 @@ public class BlockIndexer{
public Seq<Tile> getEnemy(Team team, BlockFlag type){
returnArray.clear();
Seq<TeamData> data = state.teams.present;
for(int i = 0; i < data.size; i++){
Team enemy = data.items[i].team;
if(enemy == team) continue;
TileArray set = getFlagged(enemy)[type.ordinal()];
if(set != null){
for(Tile tile : set){
returnArray.add(tile);
//when team data is not initialized, scan through every team. this is terrible
if(data.isEmpty()){
for(Team enemy : Team.all){
if(enemy == team) continue;
TileArray set = getFlagged(enemy)[type.ordinal()];
if(set != null){
for(Tile tile : set){
returnArray.add(tile);
}
}
}
}else{
for(int i = 0; i < data.size; i++){
Team enemy = data.items[i].team;
if(enemy == team) continue;
TileArray set = getFlagged(enemy)[type.ordinal()];
if(set != null){
for(Tile tile : set){
returnArray.add(tile);
}
}
}
}
return returnArray;
}

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

@@ -351,13 +351,7 @@ public class Pathfinder implements Runnable{
threadList.add(path);
//add to main thread's list of paths
Core.app.post(() -> {
mainList.add(path);
//TODO
//if(fieldMap[team.id] != null){
// fieldMap[team.id].put(target, path);
//}
});
Core.app.post(() -> mainList.add(path));
//fill with impassables by default
for(int x = 0; x < world.width(); x++){