[#4318] Prevent activities from being used from within compendiums

foundryvtt · Sep 18, 2024 · 629ac43 · 629ac43
1 parent be32700
commit 629ac43
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/module/documents/activity/mixin.mjs b/module/documents/activity/mixin.mjs
@@ -169,7 +169,7 @@ export default Base => class extends PseudoDocumentMixin(Base) {
    * @returns {Promise<ActivityUsageResults|void>}  Details on the usage process if not canceled.
    */
   async use(usage={}, dialog={}, message={}) {
-    if ( !this.item.isEmbedded ) return;
+    if ( !this.item.isEmbedded || this.item.pack ) return;
     if ( !this.item.isOwner ) {
       ui.notifications.error("DND5E.DocumentUseWarn", { localize: true });
       return;

diff --git a/module/documents/item.mjs b/module/documents/item.mjs
@@ -754,6 +754,8 @@ export default class Item5e extends SystemDocumentMixin(Item) {
    *                                                                   activities and was posted directly to chat.
    */
   async use(config={}, dialog={}, message={}) {
+    if ( this.pack ) return;
+
     let event = config.event;
     if ( config.legacy !== false ) {
       foundry.utils.logCompatibilityWarning(