diff --git a/lib/CombatTagPlus.jar b/lib/CombatTagPlus.jar new file mode 100644 index 000000000..ae2ee9bfc Binary files /dev/null and b/lib/CombatTagPlus.jar differ diff --git a/pom.xml b/pom.xml index 022f648bd..892935635 100644 --- a/pom.xml +++ b/pom.xml @@ -127,5 +127,12 @@ system ${project.basedir}/lib/Essentials.jar + + net.minelink + CombatTagPlus + 1.1.2-SNAPSHOT + system + ${project.basedir}/lib/CombatTagPlus.jar + \ No newline at end of file diff --git a/src/main/java/fr/xephi/authme/plugin/manager/CombatTagComunicator.java b/src/main/java/fr/xephi/authme/plugin/manager/CombatTagComunicator.java index 6416e6cc4..974be678f 100644 --- a/src/main/java/fr/xephi/authme/plugin/manager/CombatTagComunicator.java +++ b/src/main/java/fr/xephi/authme/plugin/manager/CombatTagComunicator.java @@ -1,10 +1,12 @@ package fr.xephi.authme.plugin.manager; -import org.bukkit.Bukkit; -import org.bukkit.entity.Entity; - import com.trc202.CombatTag.CombatTag; import com.trc202.CombatTagApi.CombatTagApi; +import net.minelink.ctplus.CombatTagPlus; +import org.bukkit.Bukkit; +import org.bukkit.entity.Entity; +import org.bukkit.entity.Player; +import org.bukkit.plugin.Plugin; public abstract class CombatTagComunicator { @@ -34,7 +36,10 @@ public abstract class CombatTagComunicator { } catch (NoClassDefFoundError ncdfe) { return false; } - return false; + + Plugin plugin = Bukkit.getServer().getPluginManager().getPlugin("CombatTagPlus"); + return (plugin != null && plugin instanceof CombatTagPlus && + player instanceof Player && ((CombatTagPlus) plugin).getNpcPlayerHelper().isNpc((Player) player)); } }