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

No main executor call

Browse Source
This commit is contained in:
Anuken
2024-01-28 11:31:03 -05:00
parent a73b783d98
commit 3be67aa52a
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
core/src/mindustry/net/ArcNetProvider.java
View File

@@ -224,21 +224,22 @@ public class ArcNetProvider implements NetProvider{
@Override @Override
public void pingHost(String address, int port, Cons<Host> valid, Cons<Exception> invalid){ public void pingHost(String address, int port, Cons<Host> valid, Cons<Exception> invalid){
mainExecutor.submit(() -> { //TODO: main executor or not?
//mainExecutor.submit(() -> {
pingHostImpl(address, port, host -> Core.app.post(() -> valid.get(host)), e -> {
//raw IP addresses can't have SRV records, so don't bother checking
if(port == Vars.port && Addresses.getAddress(address) == null){
Dns.resolveSrv("_mindustry._tcp." + address, records -> {
records.sort();
pingRecords(records, 0, host1 -> Core.app.post(() -> valid.get(host1)), srvError -> Core.app.post(() -> invalid.get(e)));
}, srvError -> Core.app.post(() -> invalid.get(e)));
}else{
Core.app.post(() -> invalid.get(e));
}
});
pingHostImpl(address, port, host -> Core.app.post(() -> valid.get(host)), e -> {
//raw IP addresses can't have SRV records, so don't bother checking
if(port == Vars.port && Addresses.getAddress(address) == null){
Dns.resolveSrv("_mindustry._tcp." + address, records -> {
records.sort();
pingRecords(records, 0, host1 -> Core.app.post(() -> valid.get(host1)), srvError -> Core.app.post(() -> invalid.get(e)));
}, srvError -> Core.app.post(() -> invalid.get(e)));
}else{
Core.app.post(() -> invalid.get(e));
}
}); });
//});
} }
private void pingRecords(Seq<SRVRecord> records, int index, Cons<Host> valid, Cons<Exception> invalid){ private void pingRecords(Seq<SRVRecord> records, int index, Cons<Host> valid, Cons<Exception> invalid){