Bug fix to tool form ability quick actions

module/actor/sheets/base.js

@@ -588,40 +588,4 @@ export class ActorSheet5e extends ActorSheet {
     };
     new ActorTraitSelector(this.actor, options).render(true)
   }
-
-
-  /* -------------------------------------------- */
-
-  /**
-   * TODO REMOVE THIS ASAP
-   * @override
-   */
-  _onSortItem(event, itemData) {
-
-    // TODO - for now, don't allow sorting for Token Actor ovrrides
-    if (this.actor.isToken) return;
-
-    // Get the drag source and its siblings
-    const source = this.actor.getOwnedItem(itemData._id);
-    const siblings = this._getSortSiblings(source);
-
-    // Get the drop target
-    const dropTarget = event.target.closest(".item");
-    const targetId = dropTarget ? dropTarget.dataset.itemId : null;
-    const target = siblings.find(s => s.data._id === targetId);
-
-    // Ensure we are only sorting like-types
-    if (target && (source.data.type !== target.data.type)) return;
-
-    // Perform the sort
-    const sortUpdates = SortingHelpers.performIntegerSort(source, {target: target, siblings});
-    const updateData = sortUpdates.map(u => {
-      const update = u.update;
-      update._id = u.target.data._id;
-      return update;
-    });
-
-    // Perform the update
-    return this.actor.updateManyEmbeddedEntities("OwnedItem", updateData);
-  }
 }

module/dice.js

@@ -49,8 +49,8 @@ export class Dice5e {
       if (!data.bonus && parts.indexOf("@bonus") !== -1) parts.pop();
 
       // Optionally include an ability score selection (used for tool checks)
-      const ability = form.find('[name="ability"]');
-      if ( ability.length && ability.val() ) {
+      const ability = form ? form.find('[name="ability"]') : null;
+      if ( ability && ability.length && ability.val() ) {
         data.ability = ability.val();
         const abl = data.abilities[data.ability];
         if ( abl ) data.mod = abl.mod;