aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni
diff options
context:
space:
mode:
authorhannibal2 <24389977+hannibal00212@users.noreply.github.com>2024-03-26 18:11:32 +0100
committerhannibal2 <24389977+hannibal00212@users.noreply.github.com>2024-03-26 18:11:32 +0100
commit9bf83a33b570b88326a8b37c2e019f5879eda4b4 (patch)
treefb7009d17c7fc4418d41bb6c4311511ef30e0ea6 /src/main/java/at/hannibal2/skyhanni
parent077aea0b56cb31c383fdf9668bdcf06611fbd62b (diff)
downloadskyhanni-9bf83a33b570b88326a8b37c2e019f5879eda4b4.tar.gz
skyhanni-9bf83a33b570b88326a8b37c2e019f5879eda4b4.tar.bz2
skyhanni-9bf83a33b570b88326a8b37c2e019f5879eda4b4.zip
micro fixes
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni')
-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 {