fix: prevent hook firing in cases where the workflow was aborted

scripts/actor/rollAbilitySave.js

@@ -7,6 +7,8 @@ export function patchRollAbilitySave() {
 async function rollAbilitySavePatch(wrapper, abilityId, options, ...rest) {
   const result = await wrapper(abilityId, options, ...rest);
 
+  if (!result) return result;
+
   const actor = this;
 
   Hooks.callAll('Actor5e.rollAbilitySave', actor, result, abilityId, options);

scripts/actor/rollAbilityTest.js

@@ -8,6 +8,8 @@ export function patchRollAbilityTest() {
 async function rollAbilityTestPatch(wrapper, abilityId, options, ...rest) {
   const result = await wrapper(abilityId, options, ...rest);
 
+  if (!result) return result;
+
   const actor = this;
 
   Hooks.callAll('Actor5e.rollAbilityTest', actor, result, abilityId, options);

scripts/actor/rollDeathSave.js

@@ -7,6 +7,8 @@ export function patchRollDeathSave() {
 async function rollDeathSavePatch(wrapper, options, ...rest) {
   const result = await wrapper(options, ...rest);
 
+  if (!result) return result;
+
   const actor = this;
 
   Hooks.callAll('Actor5e.rollDeathSave', actor, result, options);

scripts/actor/rollSkill.js

@@ -7,6 +7,8 @@ export function patchRollSkill() {
 async function rollSkillPatch(wrapper, skillId, options, ...rest) {
   const result = await wrapper(skillId, options, ...rest);
 
+  if (!result) return result;
+
   const actor = this;
 
   Hooks.callAll('Actor5e.rollSkill', actor, result, skillId, options);

scripts/item/damageRoll.js

@@ -7,6 +7,8 @@ export function patchRollDamage() {
 async function rollDamagePatch(wrapper, config, ...rest) {
   const result = await wrapper(config, ...rest);
 
+  if (!result) return result;
+
   const item = this;
   const actor = this.actor;
 

scripts/item/roll.js

@@ -7,6 +7,8 @@ export function patchRoll() {
 async function rollPatch(wrapper, options, ...rest) {
   const chatMessage = await wrapper(options, ...rest);
 
+  if (!chatMessage) return chatMessage;
+
   const item = this;
   const actor = this.actor;
 

scripts/item/rollFormula.js

@@ -7,6 +7,8 @@ export function patchRollFormula() {
 async function rollFormulaPatch(wrapper, config, ...rest) {
   const result = await wrapper(config, ...rest);
 
+  if (!result) return result;
+
   const item = this;
   const actor = this.actor;
 

scripts/item/rollRecharge.js

@@ -6,6 +6,8 @@ export function patchRollRecharge() {
 async function rollRechargePatch(wrapped, ...args) {
   const result = await wrapped(...args);
 
+  if (!result) return result;
+
   const item = this;
   const actor = this.actor;
 

scripts/item/rollToolCheck.js

@@ -6,6 +6,8 @@ export function patchRollToolCheck() {
 async function rollToolCheckPatch(wrapper, options, ...rest) {
   const result = await wrapper(options, ...rest);
 
+  if (!result) return result;
+
   const item = this;
   const actor = this.actor;