Version 10 Compatability

WBHarry · Jul 29, 2022 · 8386e0d · 8386e0d
1 parent b1b4e6e
commit 8386e0d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/module.json b/module.json
@@ -1,8 +1,18 @@
 {
-    "name": "join-combat",
+    "id": "join-combat",
     "title": "Join Combat",
     "description": "If the toggle is checked, tokens placed by the DM will automatically be added to combat and roll initiative.",
-    "author": "HarryBoy",
+    "version": "1.1.0",
+    "authors": [
+      {
+          "name": "HarryBoy"
+      }
+    ],
+    "compatibility": {
+      "minimum": 10,
+      "verified": "10.276",
+      "maximum": 10
+    },
     "esmodules": [
         "join-combat.js"
     ],
@@ -14,12 +24,7 @@
         "path": "lang/en.json"
       }
     ],
-    "dependencies": [],
-    "system": [],
-    "version": "1.0.0",
-    "minimumCoreVersion": "8",
-    "compatibleCoreVersion":"9",
     "url": "https://github.com/WBHarry/join-combat",
-    "manifest": "https://github.com/WBHarry/join-combat/releases/latest/download/module.json",
+    "update": "https://github.com/WBHarry/join-combat/releases/latest/download/module.json",
     "download": "https://github.com/WBHarry/join-combat/releases/latest/download/module.zip"
   }
diff --git a/scripts/helpers.js b/scripts/helpers.js
@@ -16,7 +16,7 @@ export const getInitiativeOptions = () => {
         return {};
     }
 
-    const currentInitiative = game.combat.data.combatants.find(x => x.id === currentCombatantId)?.data?.initiative;
+    const currentInitiative = game.combat.combatants.find(x => x.id === currentCombatantId)?.initiative;
     if(currentInitiative === undefined){
         return {};
     }