From 73784131a56e48967efbe6b7b1d1f7ef1868533b Mon Sep 17 00:00:00 2001 From: asofold Date: Fri, 24 Aug 2012 13:49:04 +0200 Subject: [PATCH] (bugfix) Citizens2 hook should unregister correctly on reloading etc. --- CompatNoCheatPlus/cncp_lists.txt | 3 +++ CompatNoCheatPlus/plugin.yml | 2 +- .../src/me/asofold/bpl/cncp/hooks/citizens2/HookCitizens2.java | 2 +- .../src/me/asofold/bpl/cncp/hooks/mcmmo/HookFacadeImpl.java | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CompatNoCheatPlus/cncp_lists.txt b/CompatNoCheatPlus/cncp_lists.txt index 3c95c8c..cffa14a 100644 --- a/CompatNoCheatPlus/cncp_lists.txt +++ b/CompatNoCheatPlus/cncp_lists.txt @@ -34,6 +34,9 @@ Generic abstract class for the mcMMO style cancelling of next x events + ticks a VERSION HISTORY --------------------------- +(6.0.1) +- (bugfix) Citizens2 hook should unregister correctly on reloading etc. + (6.0.0) - (BIG CHANGE) Restructure to load before NoCheatPlus. diff --git a/CompatNoCheatPlus/plugin.yml b/CompatNoCheatPlus/plugin.yml index d68cb67..59f526a 100644 --- a/CompatNoCheatPlus/plugin.yml +++ b/CompatNoCheatPlus/plugin.yml @@ -1,6 +1,6 @@ name: CompatNoCheatPlus main: me.asofold.bpl.cncp.CompatNoCheatPlus -version: 6.0.0 +version: 6.0.1 loadbefore: - NoCheatPlus softdepend: diff --git a/CompatNoCheatPlus/src/me/asofold/bpl/cncp/hooks/citizens2/HookCitizens2.java b/CompatNoCheatPlus/src/me/asofold/bpl/cncp/hooks/citizens2/HookCitizens2.java index 1d5c72e..d5eba2a 100644 --- a/CompatNoCheatPlus/src/me/asofold/bpl/cncp/hooks/citizens2/HookCitizens2.java +++ b/CompatNoCheatPlus/src/me/asofold/bpl/cncp/hooks/citizens2/HookCitizens2.java @@ -30,7 +30,7 @@ public class HookCitizens2 extends AbstractHook { @Override public NCPHook getNCPHook() { if (ncpHook == null){ - return new NCPHook() { + ncpHook = new NCPHook() { @Override public boolean onCheckFailure(CheckType checkType, Player player) { return CitizensAPI.getNPCRegistry().isNPC(player); diff --git a/CompatNoCheatPlus/src/me/asofold/bpl/cncp/hooks/mcmmo/HookFacadeImpl.java b/CompatNoCheatPlus/src/me/asofold/bpl/cncp/hooks/mcmmo/HookFacadeImpl.java index d3a4d9d..94c3426 100644 --- a/CompatNoCheatPlus/src/me/asofold/bpl/cncp/hooks/mcmmo/HookFacadeImpl.java +++ b/CompatNoCheatPlus/src/me/asofold/bpl/cncp/hooks/mcmmo/HookFacadeImpl.java @@ -51,7 +51,7 @@ public class HookFacadeImpl implements HookFacade, NCPHook { final String name = player.getName(); if (cancel.equals(name)){ - if (player == null || player.getTicksLived() != cancelTicks){ + if (player.getTicksLived() != cancelTicks){ // System.out.println("[cncp] No cancel (ticks/player): "+event.getPlayer().getName()); cancel = null; }