Merge pull request #79 from etiquettestartshere/1.1.20

api changes, checking for damage roll change

module.json

@@ -1,7 +1,7 @@
 {
   "id": "effectivetray",
   "title": "Effective Tray",
-  "version": "1.1.19",
+  "version": "1.1.20",
   "compatibility": {
     "minimum": "11",
     "verified": "11"

scripts/api.mjs

@@ -53,7 +53,7 @@ export class API {
     // Handle a single Uuid
     else if (foundry.utils.getType(targets) === "string") {
       const t = await fromUuid(targets);
-      t.document.isOwner ? owned = Array.from(t) : toTarget = Array.from(t);
+      t.isOwner ? owned = [t] : toTarget = [t.uuid];
     }
 
     // Handle an array of Tokens
@@ -79,11 +79,14 @@ export class API {
 
 
     // Apply what effects you can apply yourself
-    const actors = new Set();
-    for (const token of owned) if (token.actor) actors.add(token.actor);
-    for (const actor of actors) await _applyEffects(actor, effect, {effectData, concentration});
+    if (!foundry.utils.isEmpty(owned)) {
+      const actors = new Set();
+      for (const token of owned) if (token.actor ?? token) actors.add(token.actor ?? token);
+      for (const actor of actors) await _applyEffects(actor, effect, {effectData, concentration});
+    };
 
     // Ask the GM client to apply the rest
+    if (foundry.utils.isEmpty(toTarget)) return;
     if (!game.users.activeGM) return ui.notifications.warn(game.i18n.localize("EFFECTIVETRAY.NOTIFICATION.NoActiveGMEffect"));
 
     await game.socket.emit(socketID, { 

scripts/effective-tray.mjs

@@ -250,7 +250,7 @@ export class effectiveDamage {
    * Methods lacking documentation below share these parameters.
    */
   static _damageTray(message, html) {
-    if (foundry.utils.getProperty(message, "flags.dnd5e.roll.type") === "damage") {
+    if (message.rolls.some(r => r instanceof CONFIG.Dice.DamageRoll)) {
       if (!game.user.isGM) {
         if (message.whisper.length && !message.whisper.includes(game.user.id)) return;
         const damageApplication = document.createElement("effective-damage-application");
@@ -363,7 +363,7 @@ async function _effectSocket(request) {
   const actors = new Set();
   for (const target of targets) {
     const token = await fromUuid(target);
-    const targetActor = token.actor;
+    const targetActor = token.actor ?? token;
     if (target) actors.add(targetActor);
   };
   for (const actor of actors) {