diff options
| author | CalMWolfs <94038482+CalMWolfs@users.noreply.github.com> | 2023-05-16 00:12:00 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-15 16:12:00 +0200 |
| commit | 068cc5db57af16b25dd5115498ddf0e6f1fc2c80 (patch) | |
| tree | 494870e13da911e2679f1c6597c597ab18ba3a66 /src/main/java/at/hannibal2/skyhanni/features/garden | |
| parent | 36752963503cc5657ddfb3e9318c78526d769bc4 (diff) | |
| download | skyhanni-068cc5db57af16b25dd5115498ddf0e6f1fc2c80.tar.gz skyhanni-068cc5db57af16b25dd5115498ddf0e6f1fc2c80.tar.bz2 skyhanni-068cc5db57af16b25dd5115498ddf0e6f1fc2c80.zip | |
Various Fixes (#107)
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features/garden')
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt | 5 | ||||
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorTimer.kt | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt index 6c51b51fa..4018f170f 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt @@ -423,7 +423,7 @@ class GardenVisitorFeatures { logger.log("New visitor detected: '$name'") - if (config.visitorNotificationTitle) { + if (config.visitorNotificationTitle && System.currentTimeMillis() > LorenzUtils.lastWorldSwitch + 2_000) { TitleUtils.sendTitle("§eNew Visitor", 5_000) } if (config.visitorNotificationChat) { @@ -519,9 +519,8 @@ class GardenVisitorFeatures { entity, color ) { config.visitorHighlightStatus == 0 || config.visitorHighlightStatus == 2 } - } else { - RenderLivingEntityHelper.removeEntityColor(entity) } + if (color == -1 || !GardenAPI.inGarden()) RenderLivingEntityHelper.removeEntityColor(entity) // Have not gotten either of the known effected visitors (Vex and Leo) so cannot test for sure } } } diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorTimer.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorTimer.kt index e7b55bf14..3c64c076b 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorTimer.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorTimer.kt @@ -24,7 +24,6 @@ class GardenVisitorTimer { private val patternVisitors = "§b§lVisitors: §r§f\\((?<amount>\\d)\\)".toPattern() private var render = "" private var lastMillis = 0L - private var lastVisitors: Int = -1 private var sixthVisitorArrivalTime: Long = 0 private var visitorJustArrived: Boolean = false private var sixthVisitorReady: Boolean = false @@ -34,6 +33,10 @@ class GardenVisitorTimer { SkyHanniMod.feature.hidden.visitorInterval = value } + companion object { + var lastVisitors: Int = -1 + } + @SubscribeEvent fun onVisitorArrival(event: VisitorArrivalEvent) { visitorJustArrived = true |