diff options
| author | Rime <81419447+Emirlol@users.noreply.github.com> | 2024-06-17 03:58:29 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-16 20:58:29 -0400 |
| commit | 0acf3a6362cbb177dccd5287d3f413231dec9cb9 (patch) | |
| tree | 0edba4a2d781cf96b250ed717b640be1756202cd /src/main/java/de | |
| parent | 28c362384e728dbb2b02961e4ef46849286ce84d (diff) | |
| download | Skyblocker-0acf3a6362cbb177dccd5287d3f413231dec9cb9.tar.gz Skyblocker-0acf3a6362cbb177dccd5287d3f413231dec9cb9.tar.bz2 Skyblocker-0acf3a6362cbb177dccd5287d3f413231dec9cb9.zip | |
Fix rabbit coach being highlighted more often than it should be (#774)
Diffstat (limited to 'src/main/java/de')
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/skyblock/chocolatefactory/ChocolateFactorySolver.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/chocolatefactory/ChocolateFactorySolver.java b/src/main/java/de/hysky/skyblocker/skyblock/chocolatefactory/ChocolateFactorySolver.java index 69d2e532..e4f904b5 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/chocolatefactory/ChocolateFactorySolver.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/chocolatefactory/ChocolateFactorySolver.java @@ -1,11 +1,10 @@ package de.hysky.skyblocker.skyblock.chocolatefactory; import de.hysky.skyblocker.config.SkyblockerConfigManager; -import de.hysky.skyblocker.skyblock.item.tooltip.adders.LineSmoothener; import de.hysky.skyblocker.skyblock.item.tooltip.TooltipAdder; +import de.hysky.skyblocker.skyblock.item.tooltip.adders.LineSmoothener; import de.hysky.skyblocker.utils.ItemUtils; import de.hysky.skyblocker.utils.RegexUtils; -import de.hysky.skyblocker.utils.RomanNumerals; import de.hysky.skyblocker.utils.render.gui.ColorHighlight; import de.hysky.skyblocker.utils.render.gui.ContainerSolver; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; @@ -197,7 +196,7 @@ public class ChocolateFactorySolver extends ContainerSolver { if (!coachItem.isOf(Items.PLAYER_HEAD)) return Optional.empty(); String coachLore = getConcatenatedLore(coachItem); - if (totalCpsMultiplier == -1.0) return Optional.empty(); //We need the total multiplier to calculate the increase in cps. + if (totalCps < 0 || totalCpsMultiplier < 0) return Optional.empty(); //We need these 2 to calculate the increase in cps. Matcher multiplierIncreaseMatcher = MULTIPLIER_INCREASE_PATTERN.matcher(coachLore); OptionalDouble currentCpsMultiplier = RegexUtils.getDoubleFromMatcher(multiplierIncreaseMatcher); @@ -230,7 +229,7 @@ public class ChocolateFactorySolver extends ContainerSolver { Matcher costMatcher = COST_PATTERN.matcher(lore); OptionalInt cost = RegexUtils.getIntFromMatcher(costMatcher, cpsMatcher.hasMatch() ? cpsMatcher.end() : 0); //Cost comes after the cps line if (cost.isEmpty()) return Optional.empty(); - return Optional.of(new Rabbit(nextCps.getAsInt() - currentCps.getAsInt(), cost.getAsInt(), slot)); + return Optional.of(new Rabbit((nextCps.getAsInt() - currentCps.getAsInt())*(totalCpsMultiplier < 0 ? 1 : totalCpsMultiplier), cost.getAsInt(), slot)); } private static Optional<ColorHighlight> getPrestigeHighlight() { |