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

Fetching unit by type, build without type, and fixing a nullpointer crash (#9703)

Browse Source 
* Pluh

* Pluh

* Update LExecutor.java

* fixed the null

* Update LExecutor.java

* I will point your null exception

* is it null or nah

* it is nah

* Update LExecutor.java

* Update LExecutor.java

* null zero
This commit is contained in:
Cubical box
2024-04-02 22:03:14 +08:00
committed by GitHub
parent e177035593
commit d3a78a9d42
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1363,13 +1363,21 @@ public class LExecutor{
TeamData data = t.data(); TeamData data = t.data();
switch(type){ switch(type){
case unit -> exec.setobj(result, i < 0 || i >= data.units.size ? null : data.units.get(i)); case unit -> {
UnitType type = exec.obj(extra) instanceof UnitType u ? u : null;
if(type == null){
exec.setobj(result, i < 0 || i >= data.units.size ? null : data.units.get(i));
}else{
var units = data.unitCache(type);
exec.setobj(result, units == null || i < 0 || i >= units.size ? null : units.get(i));
}
}
case player -> exec.setobj(result, i < 0 || i >= data.players.size || data.players.get(i).unit().isNull() ? null : data.players.get(i).unit()); case player -> exec.setobj(result, i < 0 || i >= data.players.size || data.players.get(i).unit().isNull() ? null : data.players.get(i).unit());
case core -> exec.setobj(result, i < 0 || i >= data.cores.size ? null : data.cores.get(i)); case core -> exec.setobj(result, i < 0 || i >= data.cores.size ? null : data.cores.get(i));
case build -> { case build -> {
Block block = exec.obj(extra) instanceof Block b ? b : null; Block block = exec.obj(extra) instanceof Block b ? b : null;
if(block == null){ if(block == null){
exec.setobj(result, null); exec.setobj(result, i < 0 || i >= data.buildings.size ? null : data.buildings.get(i));
}else{ }else{
var builds = data.getBuildings(block); var builds = data.getBuildings(block);
exec.setobj(result, i < 0 || i >= builds.size ? null : builds.get(i)); exec.setobj(result, i < 0 || i >= builds.size ? null : builds.get(i));
@@ -1380,7 +1388,7 @@ public class LExecutor{
if(type == null){ if(type == null){
exec.setnum(result, data.units.size); exec.setnum(result, data.units.size);
}else{ }else{
exec.setnum(result, data.unitsByType[type.id].size); exec.setnum(result, data.unitCache(type) == null ? 0 : data.unitCache(type).size);
} }
} }
case coreCount -> exec.setnum(result, data.cores.size); case coreCount -> exec.setnum(result, data.cores.size);

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

@@ -1856,11 +1856,17 @@ public class LStatements{
fields(table, index, i -> index = i); fields(table, index, i -> index = i);
} }
if(type == FetchType.buildCount || type == FetchType.build || type == FetchType.unitCount){ if(type == FetchType.buildCount || type == FetchType.build){
row(table); row(table);
fields(table, "block", extra, i -> extra = i); fields(table, "block", extra, i -> extra = i);
} }
if(type == FetchType.unitCount || type == FetchType.unit){
row(table);
fields(table, "unit", extra, i -> extra = i);
}
} }
@Override @Override