diff --git a/src/main/java/com/gmail/nossr50/datatypes/McMMOPlayer.java b/src/main/java/com/gmail/nossr50/datatypes/McMMOPlayer.java index 9e03670fe..120c772c1 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/McMMOPlayer.java +++ b/src/main/java/com/gmail/nossr50/datatypes/McMMOPlayer.java @@ -40,6 +40,7 @@ public class McMMOPlayer { int powerLevel = 0; for (SkillType type : SkillType.values()) { + if (type.isChildSkill()) continue; if (type.getPermissions(player)) { powerLevel += profile.getSkillLevel(type); } diff --git a/src/main/java/com/gmail/nossr50/runnables/McRankAsync.java b/src/main/java/com/gmail/nossr50/runnables/McRankAsync.java index d203880a5..48ad9c87e 100644 --- a/src/main/java/com/gmail/nossr50/runnables/McRankAsync.java +++ b/src/main/java/com/gmail/nossr50/runnables/McRankAsync.java @@ -31,6 +31,7 @@ public class McRankAsync implements Runnable { sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Heading")); sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Player", new Object[] {playerName})); for (SkillType skillType : SkillType.values()) { + if (skillType.isChildSkill()) continue; if (skillType.equals(SkillType.ALL)) continue; // We want the overall ranking to be at the bottom diff --git a/src/main/java/com/gmail/nossr50/util/Database.java b/src/main/java/com/gmail/nossr50/util/Database.java index 9200b3e18..51e9c34aa 100644 --- a/src/main/java/com/gmail/nossr50/util/Database.java +++ b/src/main/java/com/gmail/nossr50/util/Database.java @@ -476,6 +476,7 @@ public class Database { if (checkConnected()) { try { for (SkillType skillType: SkillType.values()) { + if (skillType.isChildSkill()) continue; String sql; if(skillType != SkillType.ALL) { sql = "SELECT COUNT(*) AS rank FROM " + tablePrefix + "users JOIN " + tablePrefix + "skills ON user_id = id WHERE " + skillType.name().toLowerCase() + " > 0 AND " + skillType.name().toLowerCase() + " > (SELECT " + skillType.name().toLowerCase() + " FROM " + tablePrefix + "users JOIN " + tablePrefix + "skills ON user_id = id WHERE user = '" + playerName + "')";