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

Sort community servers by ping

Browse Source
This commit is contained in:
Anuken
2020-12-03 16:49:30 -05:00
parent d64f603e08
commit d13b69c36f
2 changed files with 34 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/mindustry/input/MobileInput.java
View File

@@ -836,7 +836,6 @@ public class MobileInput extends InputHandler implements GestureListener{
if(type == null) return; if(type == null) return;
boolean omni = unit.type.omniMovement; boolean omni = unit.type.omniMovement;
boolean ground = unit.isGrounded();
boolean allowHealing = type.canHeal; boolean allowHealing = type.canHeal;
boolean validHealTarget = allowHealing && target instanceof Building && ((Building)target).isValid() && target.team() == unit.team && boolean validHealTarget = allowHealing && target instanceof Building && ((Building)target).isValid() && target.team() == unit.team &&
((Building)target).damaged() && target.within(unit, type.range); ((Building)target).damaged() && target.within(unit, type.range);

18
core/src/mindustry/ui/dialogs/JoinDialog.java
View File

@@ -356,8 +356,9 @@ public class JoinDialog extends BaseDialog{
continue; continue;
} }
Table[] groupTable = {null};
//table containing all groups //table containing all groups
global.table(g -> {
for(String address : group.addresses){ for(String address : group.addresses){
String resaddress = address.contains(":") ? address.split(":")[0] : address; String resaddress = address.contains(":") ? address.split(":")[0] : address;
int resport = address.contains(":") ? Strings.parseInt(address.split(":")[1]) : port; int resport = address.contains(":") ? Strings.parseInt(address.split(":")[1]) : port;
@@ -366,8 +367,10 @@ public class JoinDialog extends BaseDialog{
res.port = resport; res.port = resport;
//add header //add header
if(g.getChildren().isEmpty()){ if(groupTable[0] == null){
g.table(head -> { global.table(t -> groupTable[0] = t).row();
groupTable[0].table(head -> {
if(!group.name.isEmpty()){ if(!group.name.isEmpty()){
head.add(group.name).color(Color.lightGray).padRight(4); head.add(group.name).color(Color.lightGray).padRight(4);
} }
@@ -379,20 +382,19 @@ public class JoinDialog extends BaseDialog{
group.setHidden(!group.hidden()); group.setHidden(!group.hidden());
image[0].getStyle().imageUp = group.hidden() ? Icon.eyeOffSmall : Icon.eyeSmall; image[0].getStyle().imageUp = group.hidden() ? Icon.eyeOffSmall : Icon.eyeSmall;
if(group.hidden() && !showHidden){ if(group.hidden() && !showHidden){
g.remove(); groupTable[0].remove();
} }
}).size(40f).get(); }).size(40f).get();
image[0].addListener(new Tooltip(t -> t.background(Styles.black6).margin(4).label(() -> !group.hidden() ? "@server.shown" : "@server.hidden"))); image[0].addListener(new Tooltip(t -> t.background(Styles.black6).margin(4).label(() -> !group.hidden() ? "@server.shown" : "@server.hidden")));
}).width(targetWidth()).padBottom(-2).row(); }).width(targetWidth()).padBottom(-2).row();
} }
addGlobalHost(res, g); addGlobalHost(res, groupTable[0]);
g.margin(5f); groupTable[0].margin(5f);
g.pack(); groupTable[0].pack();
}, e -> {}); }, e -> {});
} }
}).row();
} }
} }