From 9bf83a33b570b88326a8b37c2e019f5879eda4b4 Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal00212@users.noreply.github.com> Date: Tue, 26 Mar 2024 18:11:32 +0100 Subject: micro fixes --- .../hannibal2/skyhanni/features/garden/farming/lane/FarmingLaneAPI.kt | 3 ++- .../skyhanni/features/gui/customscoreboard/ScoreboardElements.kt | 4 +--- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/lane/FarmingLaneAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/lane/FarmingLaneAPI.kt index a130228dd..6ab266f44 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/lane/FarmingLaneAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/lane/FarmingLaneAPI.kt @@ -26,6 +26,7 @@ object FarmingLaneAPI { @SubscribeEvent fun onCropClick(event: CropClickEvent) { val crop = event.crop + GardenAPI.hasFarmingToolInHand() val lanes = lanes ?: return val lane = lanes[crop] @@ -40,7 +41,7 @@ object FarmingLaneAPI { private fun warnNoLane(crop: CropType?) { if (crop == null || currentLane != null) return - if (!GardenAPI.isCurrentlyFarming()) return + if (!GardenAPI.hasFarmingToolInHand()) return if (FarmingLaneCreator.detection) return if (!config.distanceDisplay && !config.laneSwitchNotification.enabled) return diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt index 3e9c7f434..7129315db 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt @@ -623,9 +623,7 @@ private fun getCookieShowWhen(): Boolean { return if (informationFilteringConfig.hideEmptyLines) { getCookieTime() != null - } else { - true - } + } else true } private fun getObjectiveDisplayPair() = buildList { -- cgit