aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/farming/lane/FarmingLaneAPI.kt3
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt4
2 files changed, 3 insertions, 4 deletions
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 {