From b293b29314eedd3395567f14de8747cbd7694da3 Mon Sep 17 00:00:00 2001
From: asofold <asofold@web.de>
Date: Tue, 24 Jul 2012 07:41:53 +0200
Subject: [PATCH] (remove) Direct hooking of Citizens.

---
 CompatNoCheatPlus/cncp_lists.txt              |  6 ++++
 CompatNoCheatPlus/plugin.yml                  |  3 +-
 .../bukkit/cncp/CompatNoCheatPlus.java        |  4 ---
 .../cncp/hooks/citizens/HookCitizens.java     | 36 -------------------
 4 files changed, 7 insertions(+), 42 deletions(-)
 delete mode 100644 CompatNoCheatPlus/src/me/asofold/bukkit/cncp/hooks/citizens/HookCitizens.java

diff --git a/CompatNoCheatPlus/cncp_lists.txt b/CompatNoCheatPlus/cncp_lists.txt
index 12a2f32..933d026 100644
--- a/CompatNoCheatPlus/cncp_lists.txt
+++ b/CompatNoCheatPlus/cncp_lists.txt
@@ -17,11 +17,17 @@ STACK
 
 ? another sequence number (for standard events)
 
+*** 0.3.0
 
+!(add) Option to prevent adding hooks by name.
+!(add) Refactor citizens hook into a general hook using reflection (PlayerClassHook).
 
 VERSION HISTORY
 ---------------------------
 
+(0.3.0)
+- (remove) Direct hooking of Citizens.
+
 (0.2.2)
 - (bugfix) Add noswing treatment for mcMMO.
 
diff --git a/CompatNoCheatPlus/plugin.yml b/CompatNoCheatPlus/plugin.yml
index c648d60..70f3744 100644
--- a/CompatNoCheatPlus/plugin.yml
+++ b/CompatNoCheatPlus/plugin.yml
@@ -4,5 +4,4 @@ version: 0.3.0 beta
 depend:
 - NoCheatPlus
 softdepend:
-- mcMMO
-- Citizens
\ No newline at end of file
+- mcMMO
\ No newline at end of file
diff --git a/CompatNoCheatPlus/src/me/asofold/bukkit/cncp/CompatNoCheatPlus.java b/CompatNoCheatPlus/src/me/asofold/bukkit/cncp/CompatNoCheatPlus.java
index 86a813d..a5d5bf1 100644
--- a/CompatNoCheatPlus/src/me/asofold/bukkit/cncp/CompatNoCheatPlus.java
+++ b/CompatNoCheatPlus/src/me/asofold/bukkit/cncp/CompatNoCheatPlus.java
@@ -148,10 +148,6 @@ public class CompatNoCheatPlus extends JavaPlugin implements Listener {
 			addHook(new me.asofold.bukkit.cncp.hooks.mcmmo.HookmcMMO());
 		}
 		catch (Throwable t){}
-		try{
-			addHook(new me.asofold.bukkit.cncp.hooks.citizens.HookCitizens());
-		}
-		catch (Throwable t){}
 	}
 	
 	@Override
diff --git a/CompatNoCheatPlus/src/me/asofold/bukkit/cncp/hooks/citizens/HookCitizens.java b/CompatNoCheatPlus/src/me/asofold/bukkit/cncp/hooks/citizens/HookCitizens.java
deleted file mode 100644
index ea41411..0000000
--- a/CompatNoCheatPlus/src/me/asofold/bukkit/cncp/hooks/citizens/HookCitizens.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package me.asofold.bukkit.cncp.hooks.citizens;
-
-import me.asofold.bukkit.cncp.hooks.AbstractHook;
-import net.citizensnpcs.resources.npclib.PathNPC;
-
-import org.bukkit.craftbukkit.entity.CraftPlayer;
-import org.bukkit.entity.Player;
-
-import fr.neatmonster.nocheatplus.checks.CheckEvent;
-
-public final class HookCitizens extends AbstractHook {
-	
-	public HookCitizens(){
-		assertPluginPresent("Citizens");
-	}
-	
-	@Override
-	public String getHookName() {
-		return "Citizens(default)";
-	}
-
-	@Override
-	public String getHookVersion() {
-		return "0.0";
-	}
-
-	@Override
-	public final void processEvent(final String group, final String check, final CheckEvent event) {
-		final Player player = event.getPlayer().getBukkitPlayer();
-		if (player instanceof CraftPlayer){
-			final CraftPlayer cp = (CraftPlayer) player;
-			if (cp.getHandle() instanceof PathNPC) event.setCancelled(true);
-		}
-	}
-
-}