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

Fixed deconstructor not accepting direct unit payloads

Browse Source
This commit is contained in:
Anuken
2021-10-16 13:01:03 -04:00
parent b7f030eb13
commit 290450de5b
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/mindustry/logic/LogicDialog.java
View File

@@ -70,7 +70,6 @@ public class LogicDialog extends BaseDialog{
p.margin(10f).marginRight(16f);
p.table(Tex.button, t -> {
t.defaults().fillX().height(45f);
int i = 0;
for(var s : executor.vars){
if(s.constant) continue;
@@ -122,14 +121,13 @@ public class LogicDialog extends BaseDialog{
label.act(1f);
}).padRight(pad);
//TODO type name does not update, is this important?
t.add(new Image(Tex.whiteui, color.cpy().mul(mul))).width(stub);
t.stack(new Image(Tex.whiteui, color), new Label(" " + typeName + " ", Styles.outlineLabel));
t.row();
t.add().growX().colspan(6).height(4);
t.row();
t.add().growX().colspan(6).height(4).row();
}
});
});

5
core/src/mindustry/world/blocks/payloads/PayloadDeconstructor.java
View File

@@ -85,6 +85,11 @@ public class PayloadDeconstructor extends PayloadBlock{
Draw.rect(topRegion, x, y);
}
@Override
public boolean acceptUnitPayload(Unit unit){
return payload == null && !unit.spawnedByCore;
}
@Override
public void handlePayload(Building source, Payload payload){
super.handlePayload(source, payload);