aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/me/Danker/commands
diff options
context:
space:
mode:
authorbowser0000 <bowser0000@gmail.com>2021-03-09 23:59:23 -0500
committerbowser0000 <bowser0000@gmail.com>2021-03-09 23:59:23 -0500
commit5f815a090401a6fdc1ef462596a9902a0a01d0be (patch)
tree0f3f99179594765a08623ac96fbdce977c2173e5 /src/main/java/me/Danker/commands
parentec35b6f8d7583f9c92eb212bfe4cf8d2206fc403 (diff)
downloadSkyblockMod-5f815a090401a6fdc1ef462596a9902a0a01d0be.tar.gz
SkyblockMod-5f815a090401a6fdc1ef462596a9902a0a01d0be.tar.bz2
SkyblockMod-5f815a090401a6fdc1ef462596a9902a0a01d0be.zip
Add combat 60 support
Diffstat (limited to 'src/main/java/me/Danker/commands')
-rw-r--r--src/main/java/me/Danker/commands/LobbySkillsCommand.java4
-rw-r--r--src/main/java/me/Danker/commands/SkillsCommand.java4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/me/Danker/commands/LobbySkillsCommand.java b/src/main/java/me/Danker/commands/LobbySkillsCommand.java
index 61ceea7..3d0c575 100644
--- a/src/main/java/me/Danker/commands/LobbySkillsCommand.java
+++ b/src/main/java/me/Danker/commands/LobbySkillsCommand.java
@@ -104,7 +104,7 @@ public class LobbySkillsCommand extends CommandBase {
miningLevel = (double) Math.round(miningLevel * 100) / 100;
}
if (latestProfile.has("experience_skill_combat")) {
- combatLevel = Utils.xpToSkillLevel(latestProfile.get("experience_skill_combat").getAsDouble(), 50);
+ combatLevel = Utils.xpToSkillLevel(latestProfile.get("experience_skill_combat").getAsDouble(), 60);
combatLevel = (double) Math.round(combatLevel * 100) / 100;
}
if (latestProfile.has("experience_skill_foraging")) {
@@ -146,7 +146,7 @@ public class LobbySkillsCommand 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);
diff --git a/src/main/java/me/Danker/commands/SkillsCommand.java b/src/main/java/me/Danker/commands/SkillsCommand.java
index 6edbb4e..a9ce9d1 100644
--- a/src/main/java/me/Danker/commands/SkillsCommand.java
+++ b/src/main/java/me/Danker/commands/SkillsCommand.java
@@ -100,7 +100,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 +144,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);