diff options
| author | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2023-10-07 17:37:27 +0200 |
|---|---|---|
| committer | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2023-10-07 17:37:27 +0200 |
| commit | eb325b5680d211276f6b78644b75c39e9211432e (patch) | |
| tree | b6502e8302955f11152a8c7c7264af10716a6d38 | |
| parent | b8eef97b6db9e4242cbd9906183d7bc476c580d0 (diff) | |
| parent | 2efee154b649988045f179e622cc27afe3f93013 (diff) | |
| download | skyhanni-eb325b5680d211276f6b78644b75c39e9211432e.tar.gz skyhanni-eb325b5680d211276f6b78644b75c39e9211432e.tar.bz2 skyhanni-eb325b5680d211276f6b78644b75c39e9211432e.zip | |
Merge remote-tracking branch 'origin/beta' into beta
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobFarmingContestsInventory.kt | 18 | ||||
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt | 2 |
2 files changed, 1 insertions, 19 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobFarmingContestsInventory.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobFarmingContestsInventory.kt index 3ad7f70d7..55d8bd66e 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobFarmingContestsInventory.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobFarmingContestsInventory.kt @@ -93,24 +93,6 @@ class JacobFarmingContestsInventory { } @SubscribeEvent - fun onDrawSlot(event: GuiContainerEvent.DrawSlotEvent.GuiContainerDrawSlotPre) { - if (!LorenzUtils.inSkyBlock) return - if (!InventoryUtils.openInventoryName().contains("Your Contests")) return - - if (hideEverything) { - val slot = event.slot - val number = slot.slotNumber - if (number in 10..43) { - event.isCanceled = true - return - } - - } - - event.isCanceled = true - } - - @SubscribeEvent fun onTooltip(event: LorenzToolTipEvent) { if (!LorenzUtils.inSkyBlock) return if (!InventoryUtils.openInventoryName().contains("Your Contests")) return diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt index 4ec2dbf99..5dc5b9ea3 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt @@ -648,7 +648,7 @@ object EstimatedItemValue { var level = rawLevel var multiplier = 1 - if (rawName == "ultimate_chimera") { + if (rawName == "ultimate_chimera" || rawName == "ultimate_fatal_tempo") { when (rawLevel) { 2 -> multiplier = 2 |