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

Fixed #3108 / Fixed #3112

Browse Source
This commit is contained in:
Anuken
2020-10-25 09:23:13 -04:00
parent 1d85495f7a
commit b2b0082c7d
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/mindustry/logic/LExecutor.java
View File

@@ -273,9 +273,9 @@ public class LExecutor{
cache.found = false; cache.found = false;
exec.setnum(outFound, 0); exec.setnum(outFound, 0);
} }
exec.setobj(outBuild, res != null && res.build != null && res.build.team == exec.team ? res.build : null); exec.setobj(outBuild, res != null && res.build != null && res.build.team == exec.team ? cache.build = res.build : null);
}else{ }else{
exec.setobj(outBuild, null); exec.setobj(outBuild, cache.build);
exec.setbool(outFound, cache.found); exec.setbool(outFound, cache.found);
exec.setnum(outX, cache.x); exec.setnum(outX, cache.x);
exec.setnum(outY, cache.y); exec.setnum(outY, cache.y);
@@ -286,6 +286,7 @@ public class LExecutor{
static class Cache{ static class Cache{
float x, y; float x, y;
boolean found; boolean found;
Building build;
} }
} }

8
core/src/mindustry/logic/LStatements.java
View File

@@ -748,7 +748,7 @@ public class LStatements{
@RegisterStatement("ucontrol") @RegisterStatement("ucontrol")
public static class UnitControlStatement extends LStatement{ public static class UnitControlStatement extends LStatement{
public LUnitControl type = LUnitControl.move; public LUnitControl type = LUnitControl.move;
public String p1 = "0", p2 = "0", p3 = "0", p4 = "0", p5 = ""; public String p1 = "0", p2 = "0", p3 = "0", p4 = "0", p5 = "0";
@Override @Override
public void build(Table table){ public void build(Table table){
@@ -777,9 +777,13 @@ public class LStatements{
int c = 0; int c = 0;
for(int i = 0; i < type.params.length; i++){ for(int i = 0; i < type.params.length; i++){
fields(table, type.params[i], i == 0 ? p1 : i == 1 ? p2 : i == 2 ? p3 : p4, i == 0 ? v -> p1 = v : i == 1 ? v -> p2 = v : i == 2 ? v -> p3 = v : i == 3 ? v -> p4 = v : v -> p5 = v).width(110f); fields(table, type.params[i], i == 0 ? p1 : i == 1 ? p2 : i == 2 ? p3 : i == 3 ? p4 : p5, i == 0 ? v -> p1 = v : i == 1 ? v -> p2 = v : i == 2 ? v -> p3 = v : i == 3 ? v -> p4 = v : v -> p5 = v).width(100f);
if(++c % 2 == 0) row(table); if(++c % 2 == 0) row(table);
if(i == 3){
table.row();
}
} }
} }