a

theripper93 · May 8, 2023 · 6638fea · 6638fea
1 parent 0fbded3
commit 6638fea
Showing 1 changed file with 14 additions and 11 deletions.
diff --git a/scripts/main.js b/scripts/main.js
@@ -69,18 +69,21 @@ Hooks.on("combatRound", () => {
 })
 
 Hooks.on("getSwadeCombatTrackerEntryContext", function () {
-  if (game.settings.get("combatbooster", "enableMarker")) {
-    if (!canvas.tokens.CBTurnMarker) {
-      new TurnMarker();
-      if (game.settings.get("combatbooster", "enableNextMarker")) {
-        new NextTurnMarker();
-      }
-      if (game.settings.get("combatbooster", "enableStartMarker")) {
-        new StartTurnMarker();
+  try {    
+    if (game.settings.get("combatbooster", "enableMarker")) {
+      if (!canvas.tokens.CBTurnMarker) {
+        new TurnMarker();
+        if (game.settings.get("combatbooster", "enableNextMarker")) {
+          new NextTurnMarker();
+        }
+        if (game.settings.get("combatbooster", "enableStartMarker")) {
+          new StartTurnMarker();
+        }
+      } else {
+        canvas.tokens.CBTurnMarker.MoveToCombatant();
+        canvas.tokens.CBNextTurnMarker?.MoveToCombatant()
       }
-    } else {
-      canvas.tokens.CBTurnMarker.MoveToCombatant();
-      canvas.tokens.CBNextTurnMarker?.MoveToCombatant()
     }
+  }catch (error) {
   }
 });