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

Merge pull request #3715 from Quezler/patch-75

Browse Source 
Keep items inside reconstructor when construction booped
This commit is contained in:
Anuken
2020-12-02 10:05:51 -05:00
committed by GitHub
parent 5008573aa5 382e27e1e4
commit c26a9bd123
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/world/Build.java
View File

@@ -37,8 +37,12 @@ public class Build{
Block previous = tile.block(); Block previous = tile.block();
Block sub = ConstructBlock.get(previous.size); Block sub = ConstructBlock.get(previous.size);
Seq<Building> prevBuild = new Seq<>(1);
if(tile.build != null) prevBuild.add(tile.build);
tile.setBlock(sub, team, rotation); tile.setBlock(sub, team, rotation);
tile.<ConstructBuild>bc().setDeconstruct(previous); tile.<ConstructBuild>bc().setDeconstruct(previous);
tile.<ConstructBuild>bc().prevBuild = prevBuild;
tile.build.health = tile.build.maxHealth * prevPercent; tile.build.health = tile.build.maxHealth * prevPercent;
if(unit != null && unit.isPlayer()) tile.build.lastAccessed = unit.getPlayer().name; if(unit != null && unit.isPlayer()) tile.build.lastAccessed = unit.getPlayer().name;

7
core/src/mindustry/world/blocks/units/Reconstructor.java
View File

@@ -114,6 +114,13 @@ public class Reconstructor extends UnitBlock{
return capacities[item.id]; return capacities[item.id];
} }
@Override
public void overwrote(Seq<Building> builds){
if(builds.first().block == block){
items.add(builds.first().items);
}
}
@Override @Override
public void draw(){ public void draw(){
Draw.rect(region, x, y); Draw.rect(region, x, y);