diff options
| author | CuzImClicks <bruno778.whiteelfie@gmail.com> | 2021-03-10 16:42:00 +0100 |
|---|---|---|
| committer | CuzImClicks <bruno778.whiteelfie@gmail.com> | 2021-03-10 16:42:00 +0100 |
| commit | a4710ad7f27826c02cd6421c860ed4517b854741 (patch) | |
| tree | 47ee059d2e9daaeb4ca221d8ec999bb523dfb3d8 /src/main/java/me/Danker/commands/LobbySkillsCommand.java | |
| parent | 689af426ff8203ea1d1b64420004b6b015cd2203 (diff) | |
| parent | dbad2bfbec9a2b1c8ac72ff0516a1a3d543339d6 (diff) | |
| download | SkyblockMod-a4710ad7f27826c02cd6421c860ed4517b854741.tar.gz SkyblockMod-a4710ad7f27826c02cd6421c860ed4517b854741.tar.bz2 SkyblockMod-a4710ad7f27826c02cd6421c860ed4517b854741.zip | |
Merge remote-tracking branch 'origin/development' into development
# Conflicts:
# src/main/java/me/Danker/commands/ToggleCommand.java
# src/main/java/me/Danker/gui/DankerGui.java
Diffstat (limited to 'src/main/java/me/Danker/commands/LobbySkillsCommand.java')
| -rw-r--r-- | src/main/java/me/Danker/commands/LobbySkillsCommand.java | 4 |
1 files changed, 2 insertions, 2 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); |