Fix item duplication on import

StasTserk · Jul 14, 2023 · 6462477 · 6462477
1 parent 19b6378
commit 6462477
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/module/actors/sheets/BWActorSheet.ts b/module/actors/sheets/BWActorSheet.ts
@@ -220,6 +220,18 @@ export class BWActorSheet<
         }
     }
 
+    async _onDropItem(
+        event: DragEvent,
+        data: object
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    ): Promise<boolean | ActorSheet.OwnedItemData<any> | undefined> {
+        const dragData = data as helpers.ItemDragData;
+        if (dragData.actorId === this.actor.id) {
+            return false;
+        }
+        return await super._onDropItem(event, data);
+    }
+
     getArmorDictionary(armorItems: Armor[]): { [key: string]: Armor | null } {
         let armorLocs: { [key: string]: Armor | null } = {};
         constants.armorLocations.forEach((al) => (armorLocs[al] = null)); // initialize locations

diff --git a/module/dialogs/ImportItemDialog.ts b/module/dialogs/ImportItemDialog.ts
@@ -97,8 +97,8 @@ export async function addNewItem(options: AddItemOptions): Promise<unknown> {
             await helpers.getItemsOfTypes(options.itemTypes as ItemType[])
         ).sort((a, b) => (a.name < b.name ? -1 : a.name === b.name ? 0 : 1));
         const sourceList = ['World'].concat(
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
             Array.from(game.packs?.values() || [])
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
                 .filter((p: any) => p.visible)
                 .map((p: CompendiumCollection) => {
                     return helpers.compendiumName(p);

diff --git a/module/helpers.ts b/module/helpers.ts
@@ -186,8 +186,8 @@ export function getCompendiumList(): { name: string; label: string }[] {
         game.packs?.contents || []
     ) as CompendiumCollection[];
     return [{ name: 'world', label: 'World Content' }].concat(
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         ...packs
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
             .filter((p: any) => game.user?.isGM || p.visible)
             .map((p) => {
                 return {