From b7015f56c2f30731840ea9e82eb040575a2fdef5 Mon Sep 17 00:00:00 2001 From: EbonJaguar Date: Mon, 13 Jun 2016 14:55:25 -0400 Subject: [PATCH] kick player on tempban, change setting comments to better reflect the process --- src/main/java/fr/xephi/authme/cache/TempbanManager.java | 3 ++- .../xephi/authme/settings/properties/SecuritySettings.java | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/fr/xephi/authme/cache/TempbanManager.java b/src/main/java/fr/xephi/authme/cache/TempbanManager.java index afeb09058..eacbd183a 100644 --- a/src/main/java/fr/xephi/authme/cache/TempbanManager.java +++ b/src/main/java/fr/xephi/authme/cache/TempbanManager.java @@ -86,7 +86,7 @@ public class TempbanManager implements SettingsDependent { * * @param player The player to tempban */ - public void tempbanPlayer(Player player) { + public void tempbanPlayer(final Player player) { if (isEnabled) { resetCount(player.getName()); @@ -101,6 +101,7 @@ public class TempbanManager implements SettingsDependent { @Override public void run() { Bukkit.getServer().getBanList(BanList.Type.IP).addBan(ip, reason, expires, "AuthMe"); + player.kickPlayer(reason); } }); } diff --git a/src/main/java/fr/xephi/authme/settings/properties/SecuritySettings.java b/src/main/java/fr/xephi/authme/settings/properties/SecuritySettings.java index 365f4a9a5..ddc98dbd3 100644 --- a/src/main/java/fr/xephi/authme/settings/properties/SecuritySettings.java +++ b/src/main/java/fr/xephi/authme/settings/properties/SecuritySettings.java @@ -100,15 +100,15 @@ public class SecuritySettings implements SettingsClass { public static final Property> UNSAFE_PASSWORDS = newLowercaseListProperty("settings.security.unsafePasswords", "123456", "password", "qwerty", "12345", "54321"); - @Comment("Tempban users if they enter the wrong password too many times") + @Comment("Tempban a user's IP address if they enter the wrong password too many times") public static final Property TEMPBAN_ON_MAX_LOGINS = newProperty("Security.tempban.enableTempban", false); - @Comment("How many times a user can attempt to login before being tempbanned") + @Comment("How many times a user can attempt to login before their IP being tempbanned") public static final Property MAX_LOGIN_TEMPBAN = newProperty("Security.tempban.maxLoginTries", 10); - @Comment({"The length of time a player will be tempbanned in minutes", + @Comment({"The length of time a IP address will be tempbanned in minutes", "Default: 480 minutes, or 8 hours"}) public static final Property TEMPBAN_LENGTH = newProperty("Security.tempban.tempbanLength", 480);