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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2023-12-13 22:37:39 -05:00
parent 3a485eb338 175153e870
commit 13b78927f4
3 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1360,13 +1360,20 @@ public class LExecutor{
exec.setobj(result, i < 0 || i >= builds.size ? null : builds.get(i)); exec.setobj(result, i < 0 || i >= builds.size ? null : builds.get(i));
} }
} }
case unitCount -> exec.setnum(result, data.units.size); case unitCount -> {
UnitType type = exec.obj(extra) instanceof UnitType u ? u : null;
if(type == null){
exec.setnum(result, data.units.size);
}else{
exec.setnum(result, data.unitsByType[type.id].size);
}
}
case coreCount -> exec.setnum(result, data.cores.size); case coreCount -> exec.setnum(result, data.cores.size);
case playerCount -> exec.setnum(result, data.players.size); case playerCount -> exec.setnum(result, data.players.size);
case buildCount -> { case buildCount -> {
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.setnum(result, data.buildings.size);
}else{ }else{
exec.setnum(result, data.getBuildings(block).size); exec.setnum(result, data.getBuildings(block).size);
} }

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

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

10
servers_v7.json
View File

@@ -3,6 +3,10 @@
"name": "STP", "name": "STP",
"address": ["23.88.73.88:25617"] "address": ["23.88.73.88:25617"]
}, },
{
"name" : "LesGarsCools",
"address": ["est1.be"]
},
{ {
"name": "meiqiuMDT", "name": "meiqiuMDT",
"address": ["cn1.meiqiumdy.top:7000","cn1.meiqiumdt.top:7002","cn1.meiqiumdt.top:7006","bj-1.lcf.icu:10240"] "address": ["cn1.meiqiumdy.top:7000","cn1.meiqiumdt.top:7002","cn1.meiqiumdt.top:7006","bj-1.lcf.icu:10240"]
@@ -234,7 +238,7 @@
}, },
{ {
"name": "Extra Utilities", "name": "Extra Utilities",
"address": ["222.186.59.147:15142", "222.186.59.147:15143"] "address": ["222.186.59.147:15142", "222.186.59.147:15143", "p1.i9mr.com:44922", "p1.i9mr.com:44834"]
}, },
{ {
"name": "Alex Multiverse", "name": "Alex Multiverse",
@@ -259,5 +263,9 @@
{ {
"name": "SkyPlex", "name": "SkyPlex",
"address": ["mc-skyplex.net"] "address": ["mc-skyplex.net"]
},
{
"name": "Gadgetroch's Server",
"address": ["mindustry.gadgetroch.com", "mindustry.gadgetroch.com:6568"]
} }
] ]