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

Server crash fix / Disabled logic config sync / Faster logic parsing

Browse Source
This commit is contained in:
Anuken
2021-03-15 17:13:27 -04:00
parent 96607ef753
commit 150aab3530
6 changed files with 24 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -143,7 +143,7 @@ public class PowerNode extends PowerBlock{
Draw.color(Pal.placing);
Drawf.circles(x * tilesize + offset, y * tilesize + offset, laserRange * tilesize);
getPotentialLinks(tile, other -> {
getPotentialLinks(tile, player.team(), other -> {
Draw.color(laserColor1, Renderer.laserOpacity * 0.5f);
drawLaser(tile.team(), x * tilesize + offset, y * tilesize + offset, other.x, other.y, size, other.block.size);
@@ -193,10 +193,10 @@ public class PowerNode extends PowerBlock{
return Intersector.overlaps(Tmp.cr1.set(src.worldx() + offset, src.worldy() + offset, laserRange * tilesize), Tmp.r1.setSize(size * tilesize).setCenter(other.worldx() + offset, other.worldy() + offset));
}
protected void getPotentialLinks(Tile tile, Cons<Building> others){
protected void getPotentialLinks(Tile tile, Team team, Cons<Building> others){
Boolf<Building> valid = other -> other != null && other.tile() != tile && other.power != null &&
(other.block.outputsPower || other.block.consumesPower || other.block instanceof PowerNode) &&
overlaps(tile.x * tilesize + offset, tile.y * tilesize + offset, other.tile(), laserRange * tilesize) && other.team == player.team() &&
overlaps(tile.x * tilesize + offset, tile.y * tilesize + offset, other.tile(), laserRange * tilesize) && other.team == team &&
!graphs.contains(other.power.graph) &&
!PowerNode.insulated(tile, other.tile) &&
!(other instanceof PowerNodeBuild obuild && obuild.power.links.size >= ((PowerNode)obuild.block).maxNodes) &&
@@ -211,7 +211,7 @@ public class PowerNode extends PowerBlock{
//add conducting graphs to prevent double link
for(var p : Edges.getEdges(size)){
Tile other = tile.nearby(p);
if(other != null && other.team() == player.team() && other.build != null && other.build.power != null){
if(other != null && other.team() == team && other.build != null && other.build.power != null){
graphs.add(other.build.power.graph);
}
}
@@ -351,7 +351,7 @@ public class PowerNode extends PowerBlock{
public void placed(){
if(net.client()) return;
getPotentialLinks(tile, other -> {
getPotentialLinks(tile, team, other -> {
if(!power.links.contains(other.pos())){
configureAny(other.pos());
}
@@ -382,7 +382,7 @@ public class PowerNode extends PowerBlock{
if(this == other){
if(other.power.links.size == 0){
int[] total = {0};
getPotentialLinks(tile, link -> {
getPotentialLinks(tile, team, link -> {
if(!insulated(this, link) && total[0]++ < maxNodes){
configure(link.pos());
}