aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLorenz <lo.scherf@gmail.com>2022-08-23 13:47:01 +0200
committerLorenz <lo.scherf@gmail.com>2022-08-23 13:47:01 +0200
commit0b67884057c3dd6d4fcfcec7ff6cc0730822ffa9 (patch)
treeddf29c79d40703d1e60bf5af0d73788beb4f3cdd
parenta40b447b792d5e09b2afab754a87cc50d5e2ee47 (diff)
downloadskyhanni-0b67884057c3dd6d4fcfcec7ff6cc0730822ffa9.tar.gz
skyhanni-0b67884057c3dd6d4fcfcec7ff6cc0730822ffa9.tar.bz2
skyhanni-0b67884057c3dd6d4fcfcec7ff6cc0730822ffa9.zip
support minion pickup
fixed damage indicator sorting previous damages
-rw-r--r--CHANGELOG.md8
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageCounter.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageIndicatorManager.kt2
3 files changed, 8 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f420bfbff..7ac54d3cc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,14 +1,14 @@
-# Changelog
+# SkyHanni Change Log
-## 0.5
+## Version 0.5
### New Features
- Added a display that shows the last time the hopper inside a minion has been emptied
-### Minor Change
+### Minor Changes
- Summoning souls display is rendering better close to corners
- Ashfang gravity orbs are now rendering better close to corners
- Showing the name of ashfang gravity orbs tag above
### Bug Fixes
-- \ No newline at end of file
+- Damage Indicator damage over time display swapping orders \ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageCounter.kt b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageCounter.kt
index 84bc7d50a..711523175 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageCounter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageCounter.kt
@@ -1,10 +1,12 @@
package at.hannibal2.skyhanni.features.damageindicator
+import java.util.*
+
class DamageCounter {
var currentDamage = 0L
var currentHealing = 0L
- var oldDamages = mutableListOf<OldDamage>()
+ var oldDamages = LinkedList<OldDamage>()
var firstTick = 0L
} \ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageIndicatorManager.kt b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageIndicatorManager.kt
index 072661329..78e8ca648 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageIndicatorManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageIndicatorManager.kt
@@ -167,7 +167,7 @@ class DamageIndicatorManager {
}
if (now > damageCounter.firstTick + 1_000) {
- damageCounter.oldDamages.add(OldDamage(now, damageCounter.currentDamage, damageCounter.currentHealing))
+ damageCounter.oldDamages.add(0, OldDamage(now, damageCounter.currentDamage, damageCounter.currentHealing))
damageCounter.firstTick = 0L
damageCounter.currentDamage = 0
damageCounter.currentHealing = 0