#126, #127

- #126: Fix error when toggling effects.
- #127: Add option chain when looking for item uses.

scripts/action-handler.js

@@ -931,7 +931,7 @@ Hooks.once("tokenActionHudCoreApiReady", async coreModule => {
      * @returns {boolean}   Whether the item is usable
      */
     #isUsableItem(item) {
-      return this.showUnchargedItems || item.system.uses.value || !item.system.uses.max;
+      return this.showUnchargedItems || !!item.system.uses?.value;
     }
 
     /**

scripts/roll-handler.js

@@ -364,15 +364,12 @@ Hooks.once("tokenActionHudCoreApiReady", async coreModule => {
      * @param {string} actionId The action id
      */
     async toggleEffect(event, actor, actionId) {
-      const effects = actor.effects.entries ? actor.effects.entries : actor.effects;
-      const actorEffect = effects.find(effect => effect.id === actionId);
-
-      const effect = actorEffect ?? actor.allApplicableEffects().find(effect => effect.id === actionId);
+      const effect = actor.allApplicableEffects().find(effect => effect.id === actionId);
       if (!effect) return;
 
       const isRightClick = this.isRightClick(event);
 
-      if (isRightClick && actorEffect) {
+      if (isRightClick && !effect.transfer) {
         await effect.delete();
       } else {
         await effect.update({ disabled: !effect.disabled });