[#17] Fix bug causing bar to be too large

arbron · Sep 4, 2022 · e1fd93b · e1fd93b
1 parent 9f232f1
commit e1fd93b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,8 @@
 # Changelog
 
+# [2.2.3]
+- Fix issue with bar sizing [[#17]]
+
 # [2.2.2]
 - Add support for [D&D 4e] [[#16]]
 - Add [Finnish] translation
@@ -105,9 +108,11 @@
 [2.2.0]: https://github.com/arbron/fvtt-hp-bar/compare/2.1.2...2.2.0
 [2.2.1]: https://github.com/arbron/fvtt-hp-bar/compare/2.2.0...2.2.1
 [2.2.2]: https://github.com/arbron/fvtt-hp-bar/compare/2.2.1...2.2.2
+[2.2.3]: https://github.com/arbron/fvtt-hp-bar/compare/2.2.2...2.2.3
 
 [#11]: https://github.com/arbron/fvtt-hp-bar/issues/11
 [#16]: https://github.com/arbron/fvtt-hp-bar/issues/16
+[#17]: https://github.com/arbron/fvtt-hp-bar/issues/17
 [#18]: https://github.com/arbron/fvtt-hp-bar/issues/18
 
 [D&D 3.5e]: https://foundryvtt.com/packages/D35E

diff --git a/module.json b/module.json
@@ -20,7 +20,7 @@
   "readme": "https://raw.githubusercontent.com/arbron/fvtt-hp-bar/main/readme.md",
   "changelog": "https://raw.githubusercontent.com/arbron/fvtt-hp-bar/main/changelog.md",
   "bugs": "https://github.com/arbron/fvtt-hp-bar/issues",
-  "version": "2.2.2",
+  "version": "2.2.3",
   "minimumCoreVersion": "0.7.9",
   "compatibleCoreVersion": "10",
   "compatibility": {

diff --git a/scripts/systems/default.mjs b/scripts/systems/default.mjs
@@ -9,7 +9,9 @@ export default class HPBarBase {
 
     this.w = token.w;
     this.h = Math.max((canvas.dimensions.size / 12), 8);
-    if ( token.height >= 2 ) this.h *= 1.6;  // Enlarge the bar for large tokens
+    const tokenHeight = (game.release?.generation >= 10) ? token.document.height : token.data.height;
+    console.log(tokenHeight);
+    if ( tokenHeight >= 2 ) this.h *= 1.6;  // Enlarge the bar for large tokens
   }