Meishin/LoginSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

General npc support, fixes and enhancements

Browse Source
This commit is contained in:
Gabriele C
2015-09-15 16:33:32 +02:00
parent c473e81eb9
commit 026d84427b
15 changed files with 40 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/fr/xephi/authme/api/API.java
+3 -2
View File
@@ -20,6 +20,7 @@ public class API {
public static final String newline = System.getProperty("line.separator");
public static AuthMe instance;
private Utils utils = Utils.getInstance();
@Deprecated
public API(AuthMe instance) {
@@ -65,7 +66,7 @@ public class API {
*/
@Deprecated
public boolean isaNPC(Player player) {
if (instance.getCitizensCommunicator().isNPC(player))
if (utils.isNPC(player))
return true;
return CombatTagComunicator.isNPC(player);
}
@@ -77,7 +78,7 @@ public class API {
*/
@Deprecated
public boolean isNPC(Player player) {
if (instance.getCitizensCommunicator().isNPC(player))
if (utils.isNPC(player))
return true;
return CombatTagComunicator.isNPC(player);
}
src/main/java/fr/xephi/authme/api/NewAPI.java
+2 -1
View File
@@ -23,6 +23,7 @@ public class NewAPI {
public static final String newline = System.getProperty("line.separator");
public static NewAPI singleton;
public AuthMe plugin;
private Utils utils = Utils.getInstance();
public NewAPI(AuthMe plugin) {
this.plugin = plugin;
@@ -70,7 +71,7 @@ public class NewAPI {
* @return true if player is a npc
*/
public boolean isNPC(Player player) {
return plugin.getCitizensCommunicator().isNPC(player) || CombatTagComunicator.isNPC(player);
return utils.isNPC(player) || CombatTagComunicator.isNPC(player);
}
/**