From 62179233efb040cac8daec1a7b742fe34b7e9002 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 1 Feb 2020 17:17:03 -0500 Subject: [PATCH] Bugfixes --- core/src/mindustry/ui/dialogs/ModsDialog.java | 2 +- server/src/mindustry/server/ServerControl.java | 14 +++----------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/core/src/mindustry/ui/dialogs/ModsDialog.java b/core/src/mindustry/ui/dialogs/ModsDialog.java index 8320c9eab9..ca89f3a6a6 100644 --- a/core/src/mindustry/ui/dialogs/ModsDialog.java +++ b/core/src/mindustry/ui/dialogs/ModsDialog.java @@ -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); diff --git a/server/src/mindustry/server/ServerControl.java b/server/src/mindustry/server/ServerControl.java index 0ee88e19e2..631b561b42 100644 --- a/server/src/mindustry/server/ServerControl.java +++ b/server/src/mindustry/server/ServerControl.java @@ -653,18 +653,10 @@ public class ServerControl implements ApplicationListener{ }); handler.register("unban", "", "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!"); } });