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

Cleanup continues

Browse Source
This commit is contained in:
Anuken
2020-02-04 18:00:32 -05:00
parent 012421afcb
commit a7b39e56bd
106 changed files with 2266 additions and 4543 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/ui/dialogs/AdminsDialog.java
View File

@@ -41,7 +41,7 @@ public class AdminsDialog extends FloatingDialog{
res.addImageButton(Icon.cancel, () -> {
ui.showConfirm("$confirm", "$confirmunadmin", () -> {
netServer.admins.unAdminPlayer(info.id);
playerGroup.all().each(player -> {
Groups.player.all().each(player -> {
if(player != null && player.uuid != null && player.uuid.equals(info.id)){
player.isAdmin = false;
}

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

@@ -253,7 +253,7 @@ public class JoinDialog extends FloatingDialog{
Core.settings.save();
}).grow().pad(8).get().setMaxLength(maxNameLength);
}else{
t.add(player.name).update(l -> l.setColor(player.color)).grow().pad(8);
t.add(player.name()).update(l -> l.setColor(player.color)).grow().pad(8);
}
ImageButton button = t.addImageButton(Tex.whiteui, Styles.clearFulli, 40, () -> {

6
core/src/mindustry/ui/dialogs/TraceDialog.java
View File

@@ -2,7 +2,7 @@ package mindustry.ui.dialogs;
import arc.Core;
import arc.scene.ui.layout.Table;
import mindustry.entities.type.Player;
import mindustry.gen.*;
import mindustry.gen.*;
import mindustry.net.Administration.TraceInfo;
@@ -15,7 +15,7 @@ public class TraceDialog extends FloatingDialog{
setFillParent(false);
}
public void show(Player player, TraceInfo info){
public void show(Playerc player, TraceInfo info){
cont.clear();
Table table = new Table(Tex.clear);
@@ -23,7 +23,7 @@ public class TraceDialog extends FloatingDialog{
table.defaults().pad(1);
table.defaults().left();
table.add(Core.bundle.format("trace.playername", player.name));
table.add(Core.bundle.format("trace.playername", player.name()));
table.row();
table.add(Core.bundle.format("trace.ip", info.ip));
table.row();