From c0ddeef104cd29edb2231ee47bad3374c718a2d1 Mon Sep 17 00:00:00 2001 From: asofold Date: Fri, 18 Jan 2013 00:09:42 +0100 Subject: [PATCH] Fix players counting for logins checks if already denied to login. Also lets "tempkick" feature come first. --- .../main/java/fr/neatmonster/nocheatplus/NoCheatPlus.java | 5 ++--- .../fr/neatmonster/nocheatplus/checks/chat/ChatListener.java | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/NoCheatPlus.java b/NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/NoCheatPlus.java index 913307e5..a60e21bf 100644 --- a/NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/NoCheatPlus.java +++ b/NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/NoCheatPlus.java @@ -708,10 +708,9 @@ public class NoCheatPlus extends JavaPlugin implements NoCheatPlusAPI { private Listener getCoreListener() { return new NCPListener() { @SuppressWarnings("unused") - @EventHandler(priority = EventPriority.HIGHEST) + @EventHandler(priority = EventPriority.NORMAL) public void onPlayerLogin(final PlayerLoginEvent event) { - // (HGHEST to give other plugins the possibility to add - // permissions or allow the player). + // (NORMAL to have chat checks come after this.) if (event.getResult() != Result.ALLOWED) return; final Player player = event.getPlayer(); // Check if login is denied: diff --git a/NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/checks/chat/ChatListener.java b/NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/checks/chat/ChatListener.java index 88a34a44..3592df86 100644 --- a/NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/checks/chat/ChatListener.java +++ b/NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/checks/chat/ChatListener.java @@ -198,7 +198,7 @@ public class ChatListener extends CheckListener implements INotifyReload { @EventHandler( priority = EventPriority.NORMAL) public void onPlayerLogin(final PlayerLoginEvent event) { - + if (event.getResult() != Result.ALLOWED) return; final Player player = event.getPlayer(); final ChatConfig cc = ChatConfig.getConfig(player); final ChatData data = ChatData.getData(player);