Merge pull request #91 from bowser0000/developmentv1.8.6

1.8.6

1 files changed, 6 insertions, 2 deletions

diff --git a/src/main/java/me/Danker/commands/SkillsCommand.java b/src/main/java/me/Danker/commands/SkillsCommand.java
index 6edbb4e..a17fedb 100644
--- a/src/main/java/me/Danker/commands/SkillsCommand.java
+++ b/src/main/java/me/Danker/commands/SkillsCommand.java
@@ -27,6 +27,10 @@ public class SkillsCommand extends CommandBase {
 		return "/" + getCommandName() + " [name]";
 	}
 
+	public static String usage(ICommandSender arg0) {
+		return new SkillsCommand().getCommandUsage(arg0);
+	}
+
 	@Override
 	public int getRequiredPermissionLevel() {
 		return 0;
@@ -100,7 +104,7 @@ public class SkillsCommand extends CommandBase {
 					miningLevel = (double) Math.round(miningLevel * 100) / 100;
 				}
 				if (userObject.has("experience_skill_combat")) {
-					combatLevel = Utils.xpToSkillLevel(userObject.get("experience_skill_combat").getAsDouble(), 50);
+					combatLevel = Utils.xpToSkillLevel(userObject.get("experience_skill_combat").getAsDouble(), 60);
 					combatLevel = (double) Math.round(combatLevel * 100) / 100;
 				}
 				if (userObject.has("experience_skill_foraging")) {
@@ -144,7 +148,7 @@ public class SkillsCommand extends CommandBase {
 					miningLevel = achievementObject.get("skyblock_excavator").getAsInt();
 				}
 				if (achievementObject.has("skyblock_combat")) {
-					combatLevel = Math.min(achievementObject.get("skyblock_combat").getAsInt(), 50);
+					combatLevel = achievementObject.get("skyblock_combat").getAsInt();
 				}
 				if (achievementObject.has("skyblock_gatherer")) {
 					foragingLevel = Math.min(achievementObject.get("skyblock_gatherer").getAsInt(), 50);