diff options
author | KHobbits <rob@khobbits.co.uk> | 2013-09-04 07:19:30 +0100 |
---|---|---|
committer | KHobbits <rob@khobbits.co.uk> | 2013-09-04 07:19:30 +0100 |
commit | bd4900b1144b486aabf63699c6a25d90325ad574 (patch) | |
tree | 5b3d11ab7856e142541d60be0f6d41082fe25e9f | |
parent | 2fd5777a4adafc3bc3fcaf38d49ff1e96e4755eb (diff) | |
download | Essentials-bd4900b1144b486aabf63699c6a25d90325ad574.tar Essentials-bd4900b1144b486aabf63699c6a25d90325ad574.tar.gz Essentials-bd4900b1144b486aabf63699c6a25d90325ad574.tar.lz Essentials-bd4900b1144b486aabf63699c6a25d90325ad574.tar.xz Essentials-bd4900b1144b486aabf63699c6a25d90325ad574.zip |
Expose other plugins ban masks.
-rw-r--r-- | Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java index e5839f104..150c83b68 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java +++ b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java @@ -299,6 +299,21 @@ public class EssentialsPlayerListener implements Listener user.setCompassTarget(updateLoc); } } + + @EventHandler(priority = EventPriority.LOWEST) + public void onPlayerLogin2(final PlayerLoginEvent event) + { + switch (event.getResult()) + { + case KICK_BANNED: + break; + default: + return; + } + + final String banReason = _("banFormat", _("defaultBanReason"), "Console"); + event.disallow(Result.KICK_BANNED, banReason); + } @EventHandler(priority = EventPriority.HIGH) public void onPlayerLogin(final PlayerLoginEvent event) @@ -322,7 +337,7 @@ public class EssentialsPlayerListener implements Listener String banReason = user.getBanReason(); if (banReason == null || banReason.isEmpty() || banReason.equalsIgnoreCase("ban")) { - banReason = _("defaultBanReason"); + banReason = event.getKickMessage(); } if (user.getBanTimeout() > 0) { |