Upstream/AuthMeReloaded
1
0
Fork 0
mirror of https://github.com/AuthMe/AuthMeReloaded.git synced 2025-02-17 04:11:33 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #32 from Sudzzy/master

Browse Source 
Provide support for CombatTagPlus
This commit is contained in:
Alexandre Vanhecke 2015-05-02 01:26:07 +02:00
commit 176fda47ec
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
lib/CombatTagPlus.jar Normal file
View File

Binary file not shown.

7
pom.xml
View File

@ -127,5 +127,12 @@
<scope>system</scope>
<systemPath>${project.basedir}/lib/Essentials.jar</systemPath>
</dependency>
<dependency>
<groupId>net.minelink</groupId>
<artifactId>CombatTagPlus</artifactId>
<version>1.1.2-SNAPSHOT</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/CombatTagPlus.jar</systemPath>
</dependency>
</dependencies>
</project>

13
src/main/java/fr/xephi/authme/plugin/manager/CombatTagComunicator.java
View File

@ -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));
}
}