Enhance combattag hook

This commit is contained in:
Gabriele C
2015-09-15 21:11:56 +02:00
parent 5fb3542cea
commit f63fe5bc37
11 changed files with 59 additions and 141 deletions
+2 -7
View File
@@ -12,7 +12,6 @@ import fr.xephi.authme.AuthMe;
import fr.xephi.authme.Utils;
import fr.xephi.authme.cache.auth.PlayerAuth;
import fr.xephi.authme.cache.auth.PlayerCache;
import fr.xephi.authme.plugin.manager.CombatTagComunicator;
import fr.xephi.authme.security.PasswordSecurity;
import fr.xephi.authme.settings.Settings;
@@ -66,9 +65,7 @@ public class API {
*/
@Deprecated
public boolean isaNPC(Player player) {
if (utils.isNPC(player))
return true;
return CombatTagComunicator.isNPC(player);
return utils.isNPC(player);
}
/**
@@ -78,9 +75,7 @@ public class API {
*/
@Deprecated
public boolean isNPC(Player player) {
if (utils.isNPC(player))
return true;
return CombatTagComunicator.isNPC(player);
return utils.isNPC(player);
}
/**
@@ -14,7 +14,6 @@ import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.Utils;
import fr.xephi.authme.cache.auth.PlayerAuth;
import fr.xephi.authme.cache.auth.PlayerCache;
import fr.xephi.authme.plugin.manager.CombatTagComunicator;
import fr.xephi.authme.security.PasswordSecurity;
import fr.xephi.authme.settings.Settings;
@@ -71,7 +70,7 @@ public class NewAPI {
* @return true if player is a npc
*/
public boolean isNPC(Player player) {
return utils.isNPC(player) || CombatTagComunicator.isNPC(player);
return utils.isNPC(player);
}
/**