fixed error with detecting GM syntax

spacemandev-git · May 24, 2021 · 29cb6d3 · 29cb6d3
1 parent beb49f4
commit 29cb6d3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/cardhotbar/card-hotbar.js b/cardhotbar/card-hotbar.js
@@ -427,7 +427,7 @@ export class cardHotbar extends Hotbar {
             if (!game.user.isGM) {
               let socketMsg = {
                 type: "DISCARD",
-                playerID: game.users.find((el) => el.isGM && el.data.active).id,
+                playerID: game.users.find((el) => el.isGM && el.active).id,
                 cardID: macro.data.flags.world.cardID,
               };
               game.socket.emit("module.cardsupport", socketMsg);
@@ -440,7 +440,7 @@ export class cardHotbar extends Hotbar {
             await ui.cardHotbar.populator.chbUnsetMacro(index);
           } catch (e) {
             console.error(e);
-            //console.debug ("Card Hotbar | Could not properly discard card from hand");
+            console.debug ("Card Hotbar | Could not properly discard card from hand");
           }
         },
       },

diff --git a/cardhotbar/scripts/card-hotbar-populator.js b/cardhotbar/scripts/card-hotbar-populator.js
@@ -292,9 +292,7 @@ export class cardHotbarPopulator {
                     if (!game.user.isGM) {
                       let socketMsg = {
                         type: "DISCARD",
-                        playerID: game.users.find(
-                          (el) => el.isGM && el.data.active
-                        ).id,
+                        playerID: game.users.find((el) => el.isGM && el.active).id,
                         cardID: mCardId,
                       };
                       game.socket.emit("module.cardsupport", socketMsg);

diff --git a/scripts/deck.js b/scripts/deck.js
@@ -58,7 +58,7 @@ export class Deck {
     } else {
       let msg = {
         type: "UPDATESTATE",
-        playerID: game.users.find((el) => el.isGM && el.data.active).id,
+        playerID: game.users.find((el) => el.isGM && el.active).id,
         deckID: this.deckID,
       };
       //@ts-ignore