From 0926da3782c6d82aa54e6a7f68397091315f7d11 Mon Sep 17 00:00:00 2001
From: KHobbits <rob@khobbits.co.uk>
Date: Wed, 4 Sep 2013 07:19:30 +0100
Subject: Expose other plugins ban masks.

---
 .../earth2me/essentials/EssentialsPlayerListener.java   | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

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)
 				{
-- 
cgit v1.2.3