From 77413687e9d6d6c564acdd2bf10c69cb9a522cf1 Mon Sep 17 00:00:00 2001 From: Oliver Date: Sat, 2 May 2026 19:28:03 -0600 Subject: [PATCH] Make the generic Item subtype actually provide the speaker data to the macro --- module/data/Item/attribute.mjs | 2 +- module/data/Item/generic.mjs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/module/data/Item/attribute.mjs b/module/data/Item/attribute.mjs index 1bb65c1..aaa92dc 100644 --- a/module/data/Item/attribute.mjs +++ b/module/data/Item/attribute.mjs @@ -166,7 +166,7 @@ export class AttributeItemData extends foundry.abstract.TypeDataModel { // the Actor's getData method, letting us augment the context dynamically for // the @active roll context const speaker = foundry.documents.ChatMessage.implementation.getSpeaker({ - actor: this.parent.parent + actor: this.parent.parent, }); await macro?.execute({ item: this.parent, speaker }); diff --git a/module/data/Item/generic.mjs b/module/data/Item/generic.mjs index 5c0b8db..9af745a 100644 --- a/module/data/Item/generic.mjs +++ b/module/data/Item/generic.mjs @@ -88,10 +88,10 @@ export class GenericItemData extends foundry.abstract.TypeDataModel { // the Actor's getData method, letting us augment the context dynamically for // the @active roll context const speaker = foundry.documents.ChatMessage.implementation.getSpeaker({ - actor: this.parent.parent + actor: this.parent.parent, }); - await macro?.execute({ item: this.parent }); + await macro?.execute({ item: this.parent, speaker }); }; // #endregion Methods };