TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-02-14 21:22:09 +00:00
Code Issues Projects Releases Wiki Activity

BanIP fixed, work around for isBanned.

Browse source
This commit is contained in:
KHobbits 2011-09-26 22:37:14 +01:00
parent efcab71969
commit 0dd5134f5a
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
View file

@ -307,6 +307,7 @@ public class EssentialsPlayerListener extends PlayerListener
{ {
if (event.getResult() != Result.ALLOWED && event.getResult() != Result.KICK_FULL && event.getResult() != Result.KICK_BANNED) 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; return;
} }
User user = ess.getUser(event.getPlayer()); User user = ess.getUser(event.getPlayer());
@ -316,11 +317,12 @@ public class EssentialsPlayerListener extends PlayerListener
user.checkBanTimeout(currentTime); user.checkBanTimeout(currentTime);
user.checkMuteTimeout(currentTime); user.checkMuteTimeout(currentTime);
user.checkJailTimeout(currentTime); user.checkJailTimeout(currentTime);
if (user.isBanned()) if (user.isBanned() || event.getResult() == Result.KICK_BANNED)
{ {
final String banReason = user.getBanReason(); 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; return;
} }