From 129fb00baa3e5ee618584e10de6cc0da2f15d87c Mon Sep 17 00:00:00 2001
From: Carlos Fernandez <cfern1990@gmail.com>
Date: Mon, 27 Apr 2026 05:46:14 -0400
Subject: [PATCH] Fix when opening tag teams or group rolls for different
 parties

---
 daggerheart.mjs                                 | 5 ++---
 module/applications/dialogs/groupRollDialog.mjs | 3 +--
 module/applications/dialogs/tagTeamDialog.mjs   | 3 +--
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/daggerheart.mjs b/daggerheart.mjs
index 67ebaca2..363430be 100644
--- a/daggerheart.mjs
+++ b/daggerheart.mjs
@@ -343,7 +343,7 @@ Hooks.on(CONFIG.DH.HOOKS.hooksConfig.tagTeamStart, async data => {
         if (!party) return;
 
         const TagTeamDialog = game.system.api.applications.dialogs.TagTeamDialog;
-        const dialog = foundry.applications.instances.get(TagTeamDialog.DEFAULT_OPTIONS.id) ?? new TagTeamDialog(party);
+        const dialog = foundry.applications.instances.get(`TagTeamDialog-${party.id}`) ?? new TagTeamDialog(party);
         dialog.tabGroups.application = 'tagTeamRoll';
         await dialog.render({ force: true });
     }
@@ -355,8 +355,7 @@ Hooks.on(CONFIG.DH.HOOKS.hooksConfig.groupRollStart, async data => {
         if (!party) return;
 
         const GroupRollDialog = game.system.api.applications.dialogs.GroupRollDialog;
-        const dialog =
-            foundry.applications.instances.get(GroupRollDialog.DEFAULT_OPTIONS.id) ?? new GroupRollDialog(party);
+        const dialog = foundry.applications.instances.get(`GroupRollDialog-${party.id}`) ?? new GroupRollDialog(party);
         dialog.tabGroups.application = 'groupRoll';
         await dialog.render({ force: true });
     }
diff --git a/module/applications/dialogs/groupRollDialog.mjs b/module/applications/dialogs/groupRollDialog.mjs
index df03a061..48110e4c 100644
--- a/module/applications/dialogs/groupRollDialog.mjs
+++ b/module/applications/dialogs/groupRollDialog.mjs
@@ -6,7 +6,7 @@ const { HandlebarsApplicationMixin, ApplicationV2 } = foundry.applications.api;
 
 export default class GroupRollDialog extends HandlebarsApplicationMixin(ApplicationV2) {
     constructor(party) {
-        super();
+        super({ id: `GroupRollDialog-${party.id}` });
 
         this.party = party;
         this.partyMembers = party.system.partyMembers
@@ -35,7 +35,6 @@ export default class GroupRollDialog extends HandlebarsApplicationMixin(Applicat
 
     static DEFAULT_OPTIONS = {
         tag: 'form',
-        id: 'GroupRollDialog',
         classes: ['daggerheart', 'views', 'dh-style', 'dialog', 'group-roll-dialog'],
         position: { width: 390, height: 'auto' },
         window: {
diff --git a/module/applications/dialogs/tagTeamDialog.mjs b/module/applications/dialogs/tagTeamDialog.mjs
index 026c4bc0..f5c7ab2f 100644
--- a/module/applications/dialogs/tagTeamDialog.mjs
+++ b/module/applications/dialogs/tagTeamDialog.mjs
@@ -7,7 +7,7 @@ const { HandlebarsApplicationMixin, ApplicationV2 } = foundry.applications.api;
 
 export default class TagTeamDialog extends HandlebarsApplicationMixin(ApplicationV2) {
     constructor(party) {
-        super();
+        super({ id: `TagTeamDialog-${party.id}` });
 
         this.party = party;
         this.partyMembers = party.system.partyMembers
@@ -36,7 +36,6 @@ export default class TagTeamDialog extends HandlebarsApplicationMixin(Applicatio
 
     static DEFAULT_OPTIONS = {
         tag: 'form',
-        id: 'TagTeamDialog',
         classes: ['daggerheart', 'views', 'dh-style', 'dialog', 'tag-team-dialog'],
         position: { width: 550, height: 'auto' },
         actions: {