diff options
| author | Aaron <51387595+AzureAaron@users.noreply.github.com> | 2024-05-04 19:14:06 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-04 19:14:06 -0400 |
| commit | 4a4234d7c9d4f038d4fa418fb15ef24ce3fcc501 (patch) | |
| tree | 6e87c6b67aabeb82dbe075d68c16b5492ff92c9b /src/test/java/de/hysky/skyblocker/skyblock/StatusBarTrackerTest.java | |
| parent | ed0489539902d77595625aaa3bca4e328e1f7e88 (diff) | |
| parent | f7b13895a4605e1d22e2c00e7b62c7365902d1aa (diff) | |
| download | Skyblocker-4a4234d7c9d4f038d4fa418fb15ef24ce3fcc501.tar.gz Skyblocker-4a4234d7c9d4f038d4fa418fb15ef24ce3fcc501.tar.bz2 Skyblocker-4a4234d7c9d4f038d4fa418fb15ef24ce3fcc501.zip | |
Merge pull request #669 from SkyblockerMod/1.20.5
1.20.5 & 1.20.6
Diffstat (limited to 'src/test/java/de/hysky/skyblocker/skyblock/StatusBarTrackerTest.java')
| -rw-r--r-- | src/test/java/de/hysky/skyblocker/skyblock/StatusBarTrackerTest.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/test/java/de/hysky/skyblocker/skyblock/StatusBarTrackerTest.java b/src/test/java/de/hysky/skyblocker/skyblock/StatusBarTrackerTest.java index c058da5d..9ab4e927 100644 --- a/src/test/java/de/hysky/skyblocker/skyblock/StatusBarTrackerTest.java +++ b/src/test/java/de/hysky/skyblocker/skyblock/StatusBarTrackerTest.java @@ -15,13 +15,12 @@ class StatusBarTrackerTest { void assertStats(int hp, int maxHp, int def, int mana, int maxMana, int overflowMana) { int absorption = 0; - if(hp > maxHp) { - absorption = hp - maxHp; - hp -= absorption; - if(absorption > maxHp) - absorption = maxHp; + if (hp > maxHp) { + absorption = Math.min(hp - maxHp, maxHp); + hp = maxHp; } assertEquals(new StatusBarTracker.Resource(hp, maxHp, absorption), tracker.getHealth()); + assertEquals(def, tracker.getDefense()); assertEquals(new StatusBarTracker.Resource(mana, maxMana, overflowMana), tracker.getMana()); } |