version 0.6.9

p4535992 · Oct 8, 2022 · f2935a5 · f2935a5
1 parent a292ff6
commit f2935a5
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,4 @@
-### 0.6.0-1-2-3-4-5-6-7-8
+### 0.6.0-1-2-3-4-5-6-7-8-9
 
 - Update fvtt10
 

diff --git a/gulpfile.js b/gulpfile.js
@@ -138,10 +138,8 @@ const createTransformer = () => {
                         return factory.updateExportDeclaration(node, node.decorators, node.modifiers, false, node.exportClause, newModuleSpecifier,undefined);
                     }
                 }
-                console.log(`22`);
                 return visitEachChild(node, visitor, context);
             }
-            console.log(`23`);
             return visitNode(node, visitor);
         };
     };

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
     "name": "inventory-plus",
     "title": "Inventory+",
     "description": "Enhances the default dnd5e sheets inventory to allow for reorganization",
-    "version": "0.6.8",
+    "version": "0.6.9",
     "main": "main.js",
   "scripts": {
     "publish": "gulp publish --update",

diff --git a/src/module.json b/src/module.json
@@ -2,7 +2,7 @@
 	"id": "inventory-plus",
 	"title": "Inventory+",
 	"description": "Enhances the default dnd5e sheets inventory to allow for reorganization",
-	"version": "0.6.8",
+	"version": "0.6.9",
 	"authors": [
 		{ "name": "Felix#6196" },
 		{
@@ -76,8 +76,8 @@
 	"url": "https://github.com/p4535992/foundryvtt-inventory-plus",
 	"manifest": "https://github.com/p4535992/foundryvtt-inventory-plus/releases/latest/download/module.json",
 	"download": "https://github.com/p4535992/foundryvtt-inventory-plus/releases/latest/download/module.zip",
-	"readme": "https://github.com/p4535992/foundryvtt-inventory-plus/blob/v0.6.8/README.md",
-	"changelog": "https://github.com/p4535992/foundryvtt-inventory-plus/blob/v0.6.8/CHANGELOG.md",
+	"readme": "https://github.com/p4535992/foundryvtt-inventory-plus/blob/v0.6.9/README.md",
+	"changelog": "https://github.com/p4535992/foundryvtt-inventory-plus/blob/v0.6.9/CHANGELOG.md",
 	"bugs": "https://github.com/p4535992/foundryvtt-inventory-plus/issues",
 	"allowBugReporter": true,
 	"relationships": {

diff --git a/src/scripts/lib/lib.ts b/src/scripts/lib/lib.ts
@@ -326,17 +326,19 @@ export function getCSSName(element): string | undefined {
 
 export async function retrieveItemFromData(
 	actor: Actor,
+	itemUuid: string,
 	itemId: string,
 	itemName: string,
 	currentCompendium: string,
-	sourceActorId: string,
-	itemReference: any
+	sourceActorId: string
 ): Promise<Item> {
 	let itemFounded: Item | null = null;
-	//@ts-ignore
-	itemFounded = await Item.implementation.fromDropData(itemReference);
-	if (itemFounded) {
-		return itemFounded;
+	if (itemUuid) {
+		//@ts-ignore
+		itemFounded = await Item.implementation.fromDropData({ type: "Item", uuid: itemUuid });
+		if (itemFounded) {
+			return itemFounded;
+		}
 	}
 	if (currentCompendium) {
 		const pack = game.packs.get(currentCompendium);

diff --git a/src/scripts/module.ts b/src/scripts/module.ts
@@ -100,7 +100,7 @@ export const readyHooks = async (): Promise<void> => {
 			/*
 			const itemId = itemDropped?.uuid
 				? itemDropped?.uuid.includes("Item.")
-					? itemDropped?.uuid.replace("Item.", "")
+					? itemDropped?.uuid.split('.').pop()
 					: itemDropped?.uuid
 				: itemDropped?.id;
 			if (!itemId) {
@@ -111,15 +111,15 @@ export const readyHooks = async (): Promise<void> => {
 			const dragAndDropFromActorSource = itemDropped.actorId ? true : false;
 			*/
 			const dragAndDropFromCompendium = itemDropped?.uuid.includes("Compendium");
-			const dragAndDropFromActorSource = itemDropped?.uuid.includes("Actor");
 			const itemCurrent = await retrieveItemFromData(
 				actor,
 				itemDropped.uuid,
+				itemDropped.id,
 				"",
 				itemDropped.pack,
-				itemDropped.actorId,
-				itemDropped
+				itemDropped.actorId
 			);
+			const dragAndDropFromActorSource = itemDropped?.actorId === actor.id ? true : false;
 			const itemId = itemCurrent.id;
 			let itemData: Item | null = null;
 			if (!itemCurrent) {