Drop old supports

src/main/java/fr/xephi/authme/plugin/manager/CitizensCommunicator.java

@@ -1,11 +1,9 @@
 package fr.xephi.authme.plugin.manager;
 
-import net.citizensnpcs.api.CitizensAPI;
-import net.citizensnpcs.api.CitizensManager;
-
 import org.bukkit.entity.Entity;
 
 import fr.xephi.authme.AuthMe;
+import net.citizensnpcs.api.CitizensAPI;
 
 public class CitizensCommunicator {
 
@@ -16,14 +14,10 @@ public class CitizensCommunicator {
     }
 
     public boolean isNPC(final Entity player, AuthMe instance) {
+        if (!this.instance.isCitizensActive)
+            return false;
         try {
-            if (instance.CitizensVersion == 1) {
-                return CitizensManager.isNPC(player);
-            } else if (instance.CitizensVersion == 2) {
-                return CitizensAPI.getNPCRegistry().isNPC(player);
-            } else {
-                return false;
-            }
+            return CitizensAPI.getNPCRegistry().isNPC(player);
         } catch (NoClassDefFoundError ncdfe) {
             return false;
         } catch (Exception npe) {

src/main/java/fr/xephi/authme/plugin/manager/CombatTagComunicator.java

@@ -1,7 +1,5 @@
 package fr.xephi.authme.plugin.manager;
 
-import net.minelink.ctplus.CombatTagPlus;
-
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
@@ -10,6 +8,9 @@ import org.bukkit.plugin.Plugin;
 import com.trc202.CombatTag.CombatTag;
 import com.trc202.CombatTagApi.CombatTagApi;
 
+import fr.xephi.authme.AuthMe;
+import net.minelink.ctplus.CombatTagPlus;
+
 public abstract class CombatTagComunicator {
 
     public static CombatTagApi combatApi;
@@ -21,6 +22,8 @@ public abstract class CombatTagComunicator {
      * @return true if the player is an NPC
      */
     public static boolean isNPC(Entity player) {
+        if (!AuthMe.getInstance().CombatTag)
+            return false;
         try {
             if (Bukkit.getServer().getPluginManager().getPlugin("CombatTag") != null) {
                 combatApi = new CombatTagApi((CombatTag) Bukkit.getServer().getPluginManager().getPlugin("CombatTag"));