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

Fixed override issue

Browse Source
This commit is contained in:
Anuken
2022-04-21 11:10:36 -04:00
parent e5f8eb3a30
commit bfdf07d0eb
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -133,9 +133,10 @@ public class Pathfinder implements Runnable{
break;
}
}
int arr = other.array();
//the other tile is no longer near solid, remove the solid bit
if(!otherNearSolid && tiles.length > other.array()){
tiles[other.array()] &= ~(PathTile.bitMaskNearSolid);
if(!otherNearSolid && tiles.length > arr){
tiles[arr] &= ~(PathTile.bitMaskNearSolid);
}
}
}

6
core/src/mindustry/editor/EditorTile.java
View File

@@ -39,9 +39,9 @@ public class EditorTile extends Tile{
}
@Override
public void setBlock(Block type, Team team, int rotation){
public void setBlock(Block type, Team team, int rotation, Prov<Building> entityprov){
if(skip()){
super.setBlock(type, team, rotation);
super.setBlock(type, team, rotation, entityprov);
return;
}
@@ -63,7 +63,7 @@ public class EditorTile extends Tile{
}
super.setBlock(type, team, rotation);
super.setBlock(type, team, rotation, entityprov);
}
@Override