diff options
| author | alexia <me@alexia.lol> | 2023-12-29 09:04:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-29 09:04:03 +0100 |
| commit | 1b5ad8132117960dcfb374d55ae84fa9aa876252 (patch) | |
| tree | 623f2cc77c8ad189cae4ac8b07011e1ed90b057b /src/main/java/at | |
| parent | eec5758c9888902920d58627ad55c894ab503226 (diff) | |
| download | skyhanni-1b5ad8132117960dcfb374d55ae84fa9aa876252.tar.gz skyhanni-1b5ad8132117960dcfb374d55ae84fa9aa876252.tar.bz2 skyhanni-1b5ad8132117960dcfb374d55ae84fa9aa876252.zip | |
Fix mushrooms being counted with Common/Uncommon Mooshroom Cow Pet (#849)
Fixed mushrooms being counted with Common/Uncommon Mooshroom Cow Pet. #849
Diffstat (limited to 'src/main/java/at')
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt index 78ca8f2b7..5288baf13 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt @@ -20,13 +20,18 @@ import at.hannibal2.skyhanni.features.garden.contest.FarmingContestAPI import at.hannibal2.skyhanni.features.garden.farming.GardenBestCropTime import at.hannibal2.skyhanni.features.garden.farming.GardenCropSpeed import at.hannibal2.skyhanni.features.garden.fortuneguide.FFGuideGUI +import at.hannibal2.skyhanni.features.garden.fortuneguide.FarmingItems import at.hannibal2.skyhanni.features.garden.inventory.SkyMartCopperPrice import at.hannibal2.skyhanni.features.garden.visitor.VisitorAPI import at.hannibal2.skyhanni.utils.BlockUtils.isBabyCrop import at.hannibal2.skyhanni.utils.DelayedRun import at.hannibal2.skyhanni.utils.InventoryUtils import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName +import at.hannibal2.skyhanni.utils.ItemUtils.getItemRarityOrNull import at.hannibal2.skyhanni.utils.LocationUtils.isPlayerInside +import at.hannibal2.skyhanni.utils.LorenzRarity.EPIC +import at.hannibal2.skyhanni.utils.LorenzRarity.LEGENDARY +import at.hannibal2.skyhanni.utils.LorenzRarity.RARE import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland import at.hannibal2.skyhanni.utils.LorenzVec @@ -45,7 +50,8 @@ object GardenAPI { var toolInHand: String? = null var itemInHand: ItemStack? = null var cropInHand: CropType? = null - val mushroomCowPet get() = PetAPI.isCurrentPet("Mooshroom Cow") + val mushroomCowPet get() = PetAPI.isCurrentPet("Mooshroom Cow") && + GardenAPI.storage?.fortune?.farmingItems[FarmingItems.MOOSHROOM_COW]?.getItemRarityOrNull() in listOf(RARE, EPIC, LEGENDARY) private var inBarn = false val onBarnPlot get() = inBarn && inGarden() val storage get() = ProfileStorageData.profileSpecific?.garden |