From dad2c5b0156aee4fd84cf641fae8b08d2e97ff67 Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal002@users.noreply.github.com> Date: Wed, 1 May 2024 08:40:57 +0200 Subject: Merge pull request #1608 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix not sharing location when barn full * Merge branch 'refs/heads/beta' into fix-not-sharing-location-when-bar… --- .../chocolatefactory/ChocolateFactoryBarnManager.kt | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'src/main') 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() { -- cgit