diff options
| author | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2023-08-29 22:32:48 +0200 |
|---|---|---|
| committer | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2023-08-29 22:32:48 +0200 |
| commit | 2b56e2d818ba6b40391157a4d1feeb97298fe451 (patch) | |
| tree | 54018cf6a8bf89daa18274872adcc240fd19e996 | |
| parent | fc8016345d63a42d740e290ba7717d06444d2e8f (diff) | |
| parent | 507ff527e9e59834e39512a0d6d5c96c531fb895 (diff) | |
| download | skyhanni-2b56e2d818ba6b40391157a4d1feeb97298fe451.tar.gz skyhanni-2b56e2d818ba6b40391157a4d1feeb97298fe451.tar.bz2 skyhanni-2b56e2d818ba6b40391157a4d1feeb97298fe451.zip | |
Merge remote-tracking branch 'origin/beta' into beta
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/config/Storage.java | 2 | ||||
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/config/Storage.java b/src/main/java/at/hannibal2/skyhanni/config/Storage.java index f32c66220..2b9755926 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/Storage.java +++ b/src/main/java/at/hannibal2/skyhanni/config/Storage.java @@ -235,7 +235,7 @@ public class Storage { public long lastComposterEmptyWarningTime = 0; @Expose - public FarmingWeightConfig faramingWeight = new FarmingWeightConfig(); + public FarmingWeightConfig farmingWeight = new FarmingWeightConfig(); public static class FarmingWeightConfig { diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt index 053fae0ca..71b69107b 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt @@ -209,7 +209,7 @@ class FarmingWeightDisplay { } else { leaderboardPosition-- } - ProfileStorageData.profileSpecific?.garden?.faramingWeight?.lastFarmingWeightLeaderboard = + ProfileStorageData.profileSpecific?.garden?.farmingWeight?.lastFarmingWeightLeaderboard = leaderboardPosition // Remove passed player to present the next one @@ -283,7 +283,7 @@ class FarmingWeightDisplay { if (wasNotLoaded && config.eliteFarmingWeightoffScreenDropMessage) { checkOffScreenLeaderboardChanges() } - ProfileStorageData.profileSpecific?.garden?.faramingWeight?.lastFarmingWeightLeaderboard = + ProfileStorageData.profileSpecific?.garden?.farmingWeight?.lastFarmingWeightLeaderboard = leaderboardPosition lastLeaderboardUpdate = System.currentTimeMillis() isLoadingLeaderboard = false @@ -292,7 +292,7 @@ class FarmingWeightDisplay { private fun checkOffScreenLeaderboardChanges() { val profileSpecific = ProfileStorageData.profileSpecific ?: return - val oldPosition = profileSpecific.garden.faramingWeight.lastFarmingWeightLeaderboard + val oldPosition = profileSpecific.garden.farmingWeight.lastFarmingWeightLeaderboard if (oldPosition == -1) return val diff = leaderboardPosition - oldPosition |