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

Fixed crash

Browse Source
This commit is contained in:
Anuken
2022-04-27 14:18:53 -04:00
parent 8ab584c33b
commit fa92c7ed3e
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/mindustry/entities/comp/BuildingComp.java
View File

@@ -272,11 +272,12 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
if(!ignoreConditions && (!block.rebuildable || (team == state.rules.defaultTeam && state.isCampaign() && !block.isVisible()))) return; if(!ignoreConditions && (!block.rebuildable || (team == state.rules.defaultTeam && state.isCampaign() && !block.isVisible()))) return;
Object overrideConfig = null; Object overrideConfig = null;
Block toAdd = this.block;
if(self() instanceof ConstructBuild entity){ if(self() instanceof ConstructBuild entity){
//update block to reflect the fact that something was being constructed //update block to reflect the fact that something was being constructed
if(entity.current != null && entity.current.synthetic() && entity.wasConstructing){ if(entity.current != null && entity.current.synthetic() && entity.wasConstructing){
block = entity.current; toAdd = entity.current;
overrideConfig = entity.lastConfig; overrideConfig = entity.lastConfig;
}else{ }else{
//otherwise this was a deconstruction that was interrupted, don't want to rebuild that //otherwise this was a deconstruction that was interrupted, don't want to rebuild that
@@ -298,7 +299,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
} }
} }
data.blocks.addFirst(new BlockPlan(tile.x, tile.y, (short)rotation, block.id, overrideConfig == null ? config() : overrideConfig)); data.blocks.addFirst(new BlockPlan(tile.x, tile.y, (short)rotation, toAdd.id, overrideConfig == null ? config() : overrideConfig));
} }
public @Nullable Tile findClosestEdge(Position to, Boolf<Tile> solid){ public @Nullable Tile findClosestEdge(Position to, Boolf<Tile> solid){