diff options
| author | KHobbits <rob@khobbits.co.uk> | 2011-09-26 22:37:14 +0100 |
|---|---|---|
| committer | KHobbits <rob@khobbits.co.uk> | 2011-09-26 22:37:14 +0100 |
| commit | 223ae8c87b189c542f9f797c39df5d27a84912f0 (patch) | |
| tree | 20ef17a3026293ac8d36cf724754a52f88d1007a | |
| parent | f7b30b83b305da68f560767edcdfc61c7fc00747 (diff) | |
| download | Essentials-223ae8c87b189c542f9f797c39df5d27a84912f0.tar Essentials-223ae8c87b189c542f9f797c39df5d27a84912f0.tar.gz Essentials-223ae8c87b189c542f9f797c39df5d27a84912f0.tar.lz Essentials-223ae8c87b189c542f9f797c39df5d27a84912f0.tar.xz Essentials-223ae8c87b189c542f9f797c39df5d27a84912f0.zip | |
BanIP fixed, work around for isBanned.
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java index 9ba02b5c3..2c93bb402 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java +++ b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java @@ -307,6 +307,7 @@ public class EssentialsPlayerListener extends PlayerListener { if (event.getResult() != Result.ALLOWED && event.getResult() != Result.KICK_FULL && event.getResult() != Result.KICK_BANNED) { + LOGGER.log(Level.INFO, "Disconnecting user " + event.getPlayer().toString() + " due to " + event.getResult().toString()); return; } User user = ess.getUser(event.getPlayer()); @@ -316,11 +317,12 @@ public class EssentialsPlayerListener extends PlayerListener user.checkBanTimeout(currentTime); user.checkMuteTimeout(currentTime); user.checkJailTimeout(currentTime); - - if (user.isBanned()) + + if (user.isBanned() || event.getResult() == Result.KICK_BANNED) { final String banReason = user.getBanReason(); - event.disallow(Result.KICK_BANNED, banReason != null && !banReason.isEmpty() ? banReason : Util.i18n("defaultBanReason")); + LOGGER.log(Level.INFO, "Banned for '" + banReason + "'"); + event.disallow(Result.KICK_BANNED, banReason != null && !banReason.isEmpty() && !banReason.equalsIgnoreCase("ban") ? banReason : Util.i18n("defaultBanReason")); return; } |