diff options
| author | David Cole <40234707+DavidArthurCole@users.noreply.github.com> | 2024-10-01 14:00:20 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-01 20:00:20 +0200 |
| commit | 22dfa1ec9977a9440a23f7f7efbf79da81b79e6b (patch) | |
| tree | f0b35001ccc1e2e36a3851c42acba42cd97b1197 /src/main/java/at/hannibal2/skyhanni/features/event | |
| parent | 0135920e7bd317211514d75f6436463507654866 (diff) | |
| download | skyhanni-22dfa1ec9977a9440a23f7f7efbf79da81b79e6b.tar.gz skyhanni-22dfa1ec9977a9440a23f7f7efbf79da81b79e6b.tar.bz2 skyhanni-22dfa1ec9977a9440a23f7f7efbf79da81b79e6b.zip | |
Fix: Strays Wrongly Counting as Unique (#2627)
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features/event')
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityAPI.kt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityAPI.kt index 09c0dedf9..0a144aa2f 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityAPI.kt @@ -14,6 +14,8 @@ import at.hannibal2.skyhanni.features.event.hoppity.HoppityEggsManager.eggFoundP import at.hannibal2.skyhanni.features.event.hoppity.HoppityEggsManager.getEggType import at.hannibal2.skyhanni.features.inventory.chocolatefactory.ChocolateFactoryAPI import at.hannibal2.skyhanni.features.inventory.chocolatefactory.ChocolateFactoryStrayTracker +import at.hannibal2.skyhanni.features.inventory.chocolatefactory.ChocolateFactoryStrayTracker.duplicateDoradoStrayPattern +import at.hannibal2.skyhanni.features.inventory.chocolatefactory.ChocolateFactoryStrayTracker.duplicatePseudoStrayPattern import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule import at.hannibal2.skyhanni.utils.InventoryUtils import at.hannibal2.skyhanni.utils.ItemUtils.getLore @@ -24,6 +26,7 @@ import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.RegexUtils.firstMatcher import at.hannibal2.skyhanni.utils.RegexUtils.groupOrNull import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher +import at.hannibal2.skyhanni.utils.RegexUtils.matches import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getMinecraftId import at.hannibal2.skyhanni.utils.SkyblockSeason import net.minecraftforge.fml.common.eventhandler.EventPriority @@ -108,12 +111,14 @@ object HoppityAPI { EggFoundEvent(STRAY, it.slotNumber).post() lastName = "§9Fish the Rabbit" lastMeal = STRAY + duplicate = it.stack.getLore().any { line -> duplicatePseudoStrayPattern.matches(line)} attemptFireRabbitFound() } "El Dorado" -> { EggFoundEvent(STRAY, it.slotNumber).post() lastName = "§6El Dorado" lastMeal = STRAY + duplicate = it.stack.getLore().any { line -> duplicateDoradoStrayPattern.matches(line)} attemptFireRabbitFound() } else -> return@matchMatcher |