From b2f513b1ad6e625f0e883f6319620f507a778aa6 Mon Sep 17 00:00:00 2001 From: asofold Date: Mon, 5 Nov 2012 13:16:06 +0100 Subject: [PATCH] Some events still can not be cancelled at all. --- .../hooks/NCPExemptionManager.java | 57 +++++++++---------- 1 file changed, 27 insertions(+), 30 deletions(-) diff --git a/src/fr/neatmonster/nocheatplus/hooks/NCPExemptionManager.java b/src/fr/neatmonster/nocheatplus/hooks/NCPExemptionManager.java index ef9d41c4..75ea2fdc 100644 --- a/src/fr/neatmonster/nocheatplus/hooks/NCPExemptionManager.java +++ b/src/fr/neatmonster/nocheatplus/hooks/NCPExemptionManager.java @@ -111,37 +111,34 @@ public class NCPExemptionManager { exemptPermanently(player.getEntityId(), checkType); } - /** - * This should be registered before all other listeners of NoCheatPlus. - * - * NOTE: For internal use only, DO NOT CALL FROM OUTSIDE. - * - * @return the listener - */ - public static Listener getListener() { - return new Listener() { - @SuppressWarnings("unused") - @EventHandler( - ignoreCancelled = true, priority = EventPriority.LOWEST) - public void onPlayerJoin(final PlayerJoinEvent event) { - NCPExemptionManager.registerPlayer(event.getPlayer()); - } + /** + * This should be registered before all other listeners of NoCheatPlus. + * + * NOTE: For internal use only, DO NOT CALL FROM OUTSIDE. + * + * @return the listener + */ + public static Listener getListener() { + return new Listener() { + @SuppressWarnings("unused") + @EventHandler(priority = EventPriority.LOWEST) + public void onPlayerJoin(final PlayerJoinEvent event) { + NCPExemptionManager.registerPlayer(event.getPlayer()); + } - @SuppressWarnings("unused") - @EventHandler( - ignoreCancelled = true, priority = EventPriority.MONITOR) - public void onPlayerQuit(final PlayerQuitEvent event) { - NCPExemptionManager.tryToRemove(event.getPlayer()); - } - - @SuppressWarnings("unused") - @EventHandler( - ignoreCancelled = true, priority = EventPriority.MONITOR) - public void onPlayerKick(final PlayerKickEvent event) { - NCPExemptionManager.tryToRemove(event.getPlayer()); - } - }; - } + @SuppressWarnings("unused") + @EventHandler(priority = EventPriority.MONITOR) + public void onPlayerQuit(final PlayerQuitEvent event) { + NCPExemptionManager.tryToRemove(event.getPlayer()); + } + + @SuppressWarnings("unused") + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) + public void onPlayerKick(final PlayerKickEvent event) { + NCPExemptionManager.tryToRemove(event.getPlayer()); + } + }; + } /** * Check if an entity is exempted from a check right now by entity id.