EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-29 16:46:46 +01:00
Code Issues Projects Releases Wiki Activity

Only check names if CombatTag is enabled.

Browse Source
This commit is contained in:
GJ 2013-04-29 00:29:38 -04:00
parent 15da9d580b
commit b97afb85a1
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/gmail/nossr50/mcMMO.java
View File

@ -82,8 +82,9 @@ public class mcMMO extends JavaPlugin {
// Update Check // Update Check
private boolean updateAvailable; private boolean updateAvailable;
// Spout Check // Plugin Checks
public static boolean spoutEnabled; public static boolean spoutEnabled;
public static boolean combatTagEnabled;
// XP Event Check // XP Event Check
private boolean xpEventEnabled; private boolean xpEventEnabled;
@ -113,6 +114,8 @@ public class mcMMO extends JavaPlugin {
setupSpout(); setupSpout();
loadConfigFiles(); loadConfigFiles();
combatTagEnabled = getServer().getPluginManager().isPluginEnabled("CombatTag");
databaseManager = new DatabaseManager(this, Config.getInstance().getUseMySQL()); databaseManager = new DatabaseManager(this, Config.getInstance().getUseMySQL());
registerEvents(); registerEvents();

2
src/main/java/com/gmail/nossr50/util/Misc.java
View File

@ -44,7 +44,7 @@ public final class Misc {
} }
public static boolean isNPCEntity(Entity entity) { public static boolean isNPCEntity(Entity entity) {
return (entity == null || entity.hasMetadata("NPC") || (entity instanceof HumanEntity && ((HumanEntity) entity).getName().contains("PvpLogger"))); return (entity == null || entity.hasMetadata("NPC") || (mcMMO.combatTagEnabled && entity instanceof HumanEntity && ((HumanEntity) entity).getName().contains("PvpLogger")));
} }
/** /**