aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorhannibal2 <24389977+hannibal002@users.noreply.github.com>2024-05-01 08:40:57 +0200
committerGitHub <noreply@github.com>2024-05-01 16:40:57 +1000
commitdad2c5b0156aee4fd84cf641fae8b08d2e97ff67 (patch)
treee803c2abcba99395ab53876db6961c4f94e01ea5 /src
parente5dbd02b47d36940a293a2696d20222bfcb50e91 (diff)
downloadskyhanni-dad2c5b0156aee4fd84cf641fae8b08d2e97ff67.tar.gz
skyhanni-dad2c5b0156aee4fd84cf641fae8b08d2e97ff67.tar.bz2
skyhanni-dad2c5b0156aee4fd84cf641fae8b08d2e97ff67.zip
Merge pull request #1608
* fix not sharing location when barn full * Merge branch 'refs/heads/beta' into fix-not-sharing-location-when-bar…
Diffstat (limited to 'src')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBarnManager.kt12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBarnManager.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBarnManager.kt
index 7154af4a1..3a09d1435 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBarnManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryBarnManager.kt
@@ -25,6 +25,14 @@ object ChocolateFactoryBarnManager {
"§7§lDUPLICATE RABBIT! §6\\+[\\d,]+ Chocolate"
)
+ /**
+ * REGEX-TEST: §c§lBARN FULL! §fOlivette §7got §ccrushed§7! §6+290,241 Chocolate
+ */
+ private val rabbitCrashedPattern by ChocolateFactoryAPI.patternGroup.pattern(
+ "rabbit.duplicate",
+ "§c§lBARN FULL! §f\\D+ §7got §ccrushed§7! §6.+ Chocolate"
+ )
+
var barnFull = false
private var lastBarnFullWarning = SimpleTimeMark.farPast()
@@ -42,6 +50,10 @@ object ChocolateFactoryBarnManager {
rabbitDuplicatePattern.matchMatcher(event.message) {
HoppityEggsManager.shareWaypointPrompt()
}
+
+ rabbitCrashedPattern.matchMatcher(event.message) {
+ HoppityEggsManager.shareWaypointPrompt()
+ }
}
fun trySendBarnFullMessage() {