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

Fixed #7677

Browse Source
This commit is contained in:
Anuken
2022-10-08 16:29:29 -04:00
parent 719a2f1419
commit 308219b68b
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
core/src/mindustry/world/blocks/power/PowerNode.java
View File

@@ -237,11 +237,14 @@ public class PowerNode extends PowerBlock{
} }
var worldRange = laserRange * tilesize; var worldRange = laserRange * tilesize;
team.data().buildingTree.intersect(tile.worldx() - worldRange, tile.worldy() - worldRange, worldRange * 2, worldRange * 2, build -> { var tree = team.data().buildingTree;
if(valid.get(build) && !tempBuilds.contains(build)){ if(tree != null){
tempBuilds.add(build); tree.intersect(tile.worldx() - worldRange, tile.worldy() - worldRange, worldRange * 2, worldRange * 2, build -> {
} if(valid.get(build) && !tempBuilds.contains(build)){
}); tempBuilds.add(build);
}
});
}
tempBuilds.sort((a, b) -> { tempBuilds.sort((a, b) -> {
int type = -Boolean.compare(a.block instanceof PowerNode, b.block instanceof PowerNode); int type = -Boolean.compare(a.block instanceof PowerNode, b.block instanceof PowerNode);
@@ -290,11 +293,14 @@ public class PowerNode extends PowerBlock{
} }
var rangeWorld = maxRange * tilesize; var rangeWorld = maxRange * tilesize;
team.data().buildingTree.intersect(tile.worldx() - rangeWorld, tile.worldy() - rangeWorld, rangeWorld * 2, rangeWorld * 2, build -> { var tree = team.data().buildingTree;
if(valid.get(build) && !tempBuilds.contains(build)){ if(tree != null){
tempBuilds.add(build); tree.intersect(tile.worldx() - rangeWorld, tile.worldy() - rangeWorld, rangeWorld * 2, rangeWorld * 2, build -> {
} if(valid.get(build) && !tempBuilds.contains(build)){
}); tempBuilds.add(build);
}
});
}
tempBuilds.sort((a, b) -> { tempBuilds.sort((a, b) -> {
int type = -Boolean.compare(a.block instanceof PowerNode, b.block instanceof PowerNode); int type = -Boolean.compare(a.block instanceof PowerNode, b.block instanceof PowerNode);