mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-07-04 15:27:19 +07:00
Code Issues Packages Projects Releases Wiki Activity

Bugfixes

Browse Source
This commit is contained in:
Anuken
2020-02-01 17:17:03 -05:00
parent eabebcefc7
commit 62179233ef
2 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -87,7 +87,7 @@ public class ModsDialog extends FloatingDialog{
void modError(Throwable error){
ui.loadfrag.hide();
if(Strings.getCauses(error).contains(t -> t.getMessage() != null && (t.getMessage().contains("SSL") || t.getMessage().contains("protocol")))){
if(Strings.getCauses(error).contains(t -> t.getMessage() != null && (t.getMessage().contains("trust anchor") || t.getMessage().contains("SSL") || t.getMessage().contains("protocol")))){
ui.showErrorMessage("$feature.unsupported");
}else{
ui.showException(error);

14
server/src/mindustry/server/ServerControl.java
View File

@ -653,18 +653,10 @@ public class ServerControl implements ApplicationListener{
});
handler.register("unban", "<ip/ID>", "Completely unban a person by IP or ID.", arg -> {
if(arg[0].contains(".")){
if(netServer.admins.unbanPlayerIP(arg[0])){
info("Unbanned player by IP: {0}.", arg[0]);
}else{
err("That IP is not banned!");
}
if(netServer.admins.unbanPlayerIP(arg[0]) || netServer.admins.unbanPlayerID(arg[0])){
info("Unbanned player.", arg[0]);
}else{
if(netServer.admins.unbanPlayerID(arg[0])){
info("Unbanned player by ID: {0}.", arg[0]);
}else{
err("That ID is not banned!");
}
err("That IP/ID is not banned!");
}
});