version 0.6.14

p4535992 · Nov 23, 2022 · 9be21a0 · 9be21a0
1 parent 56a2c27
commit 9be21a0
Show file tree

Hide file tree

Showing 4 changed files with 90 additions and 23 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,9 @@
-### 0.6.10-11-12
+### 0.6.14
+
+- Bug fix: https://github.com/p4535992/foundryvtt-inventory-plus/issues/20
+- Bug fix: https://github.com/p4535992/foundryvtt-inventory-plus/issues/19
+
+### 0.6.10-11-12-13
 
 - BUg fix; https://github.com/p4535992/foundryvtt-inventory-plus/issues/14
 - Bug fix: https://github.com/p4535992/foundryvtt-inventory-plus/issues/13

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.13",
+    "version": "0.6.14",
     "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.13",
+	"version": "0.6.14",
 	"authors": [
 		{
 			"name": "Felix#6196"
@@ -82,8 +82,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.13/README.md",
-	"changelog": "https://github.com/p4535992/foundryvtt-inventory-plus/blob/v0.6.13/CHANGELOG.md",
+	"readme": "https://github.com/p4535992/foundryvtt-inventory-plus/blob/v0.6.14/README.md",
+	"changelog": "https://github.com/p4535992/foundryvtt-inventory-plus/blob/v0.6.14/CHANGELOG.md",
 	"bugs": "https://github.com/p4535992/foundryvtt-inventory-plus/issues",
 	"allowBugReporter": true,
 	"relationships": {

diff --git a/src/scripts/module.ts b/src/scripts/module.ts
@@ -6,6 +6,7 @@ import { InventoryPlus } from "./inventory-plus";
 import { Category, EncumbranceDnd5e, InventoryPlusFlags } from "./inventory-plus-models";
 import {
 	getCSSName,
+	debug,
 	i18n,
 	warn,
 	i18nFormat,
@@ -160,13 +161,15 @@ export const readyHooks = async (): Promise<void> => {
 				? //@ts-ignore
 				  itemDropped.actor.id
 				: //@ts-ignore
-				item.parent && item.parent instanceof Actor
+				itemDropped.parent && itemDropped.parent instanceof Actor
 				? //@ts-ignore
-				  item.parent.id
+				  itemDropped.parent.id
 				: //@ts-ignore
 				  undefined;
 
-			const sourceActor = game.actors?.get(sourceActorId);
+			const sourceActor = sourceActorId 
+				? game.actors?.get(sourceActorId)
+				: undefined;
 
 			let createdItem: Item | undefined = undefined;
 
@@ -187,21 +190,25 @@ export const readyHooks = async (): Promise<void> => {
 			if (!targetType) {
 				// No type founded use standard system
 
-				if (!this.actor.isOwner) return false;
+				if (!this.actor.isOwner) {
+					return false;
+				}
 				//@ts-ignore
 				const item = <Item>await Item.implementation.fromDropData(itemDropped);
 				const itemData = item.toObject();
 
 				// Handle item sorting within the same Actor
-				if (await _isFromSameActor(actor, itemDropped)) return this._onSortItem(event, itemData);
-
+				if (await _isFromSameActor(actor, itemDropped)) {
+					return this._onSortItem(event, itemData);
+				}
 				// Create the owned item
 				if (
 					game.settings.get(CONSTANTS.MODULE_NAME, "enableItemTransfer") &&
 					!(await _isFromSameActor(actor, itemDropped)) &&
 					!isAlt() &&
 					!dragAndDropFromCompendium &&
-					dragAndDropFromActorSource
+					dragAndDropFromActorSource &&
+					sourceActor
 				) {
 					//@ts-ignore
 					module.dropActorSheetDataTransferStuff(targetActor, sourceActor, itemDropped);
@@ -231,7 +238,8 @@ export const readyHooks = async (): Promise<void> => {
 					!(await _isFromSameActor(actor, itemDropped)) &&
 					!isAlt() &&
 					!dragAndDropFromCompendium &&
-					dragAndDropFromActorSource
+					dragAndDropFromActorSource &&
+					sourceActor
 				) {
 					//@ts-ignore
 					module.dropActorSheetDataTransferStuff(targetActor, sourceActor, itemDropped);
@@ -258,7 +266,8 @@ export const readyHooks = async (): Promise<void> => {
 					!(await _isFromSameActor(actor, itemDropped)) &&
 					!isAlt() &&
 					!dragAndDropFromCompendium &&
-					dragAndDropFromActorSource
+					dragAndDropFromActorSource &&
+					sourceActor
 				) {
 					//@ts-ignore
 					module.dropActorSheetDataTransferStuff(targetActor, sourceActor, itemDropped);
@@ -288,7 +297,8 @@ export const readyHooks = async (): Promise<void> => {
 					!(await _isFromSameActor(actor, itemDropped)) &&
 					!isAlt() &&
 					!dragAndDropFromCompendium &&
-					dragAndDropFromActorSource
+					dragAndDropFromActorSource &&
+					sourceActor
 				) {
 					//@ts-ignore
 					module.dropActorSheetDataTransferStuff(targetActor, sourceActor, itemDropped);
@@ -321,7 +331,8 @@ export const readyHooks = async (): Promise<void> => {
 					!(await _isFromSameActor(actor, itemDropped)) &&
 					!isAlt() &&
 					!dragAndDropFromCompendium &&
-					dragAndDropFromActorSource
+					dragAndDropFromActorSource &&
+					sourceActor
 				) {
 					//@ts-ignore
 					module.dropActorSheetDataTransferStuff(targetActor, sourceActor, itemDropped);
@@ -373,7 +384,8 @@ export const readyHooks = async (): Promise<void> => {
 							!(await _isFromSameActor(actor, itemDropped)) &&
 							!isAlt() &&
 							!dragAndDropFromCompendium &&
-							dragAndDropFromActorSource
+							dragAndDropFromActorSource &&
+							sourceActor
 						) {
 							//@ts-ignore
 							module.dropActorSheetDataTransferStuff(targetActor, sourceActor, itemDropped);
@@ -428,7 +440,8 @@ export const readyHooks = async (): Promise<void> => {
 								!(await _isFromSameActor(actor, itemDropped)) &&
 								!isAlt() &&
 								!dragAndDropFromCompendium &&
-								dragAndDropFromActorSource
+								dragAndDropFromActorSource &&
+								sourceActor
 							) {
 								//@ts-ignore
 								module.dropActorSheetDataTransferStuff(targetActor, sourceActor, itemDropped);
@@ -624,6 +637,15 @@ const module = {
 		if (!game.settings.get(CONSTANTS.MODULE_NAME, "enableInventorySorter")) {
 			return false;
 		}
+		const user = game.user;
+		if (!user?.character) {
+			debug(`Can't reorder you need to set a actor to the game user`);
+			return false;
+		}
+		if (user.character.id !== (<Actor>item.parent).id) {
+			debug(`Can't reorder you can order ONLY the actor connected to the game user`);
+			return false;
+		}
 		if (changes.sort !== undefined) {
 			if (!options.inventorySorterUpdate) {
 				const itemSorts = getItemSorts(<Actor>item.parent);
@@ -642,42 +664,82 @@ const module = {
 
 	createItemInventorySorter(item: Item, options: any, userId: string, ...args) {
 		if (!game.settings.get(CONSTANTS.MODULE_NAME, "enableInventorySorter")) {
-			return;
+			return false;
+		}
+		const user = game.users?.get(userId);
+		if (!user?.character) {
+			debug(`Can't reorder you need to set a actor to the game user`);
+			return false;
+		}
+		if (user.character.id !== (<Actor>item.parent).id) {
+			debug(`Can't reorder you can order ONLY the actor connected to the game user`);
+			return false;
 		}
 		if (userId === game.userId) {
 			delayedSort(<Actor>item.parent);
 		}
+		return true;
 	},
 
-	deleteItemInventorySorter(item: Item, options: any, userId: string, ...args) {
+	deleteItemInventorySorter(item: Item, options: any, userId: string, ...args): boolean {
 		if (!game.settings.get(CONSTANTS.MODULE_NAME, "enableInventorySorter")) {
-			return;
+			return false;
+		}
+		const user = game.users?.get(userId);
+		if (!user?.character) {
+			debug(`Can't reorder you need to set a actor to the game user`);
+			return false;
+		}
+		if (user.character.id !== (<Actor>item.parent).id) {
+			debug(`Can't reorder you can order ONLY the actor connected to the game user`);
+			return false;
 		}
 		if (userId === game.userId) {
 			delayedSort(<Actor>item.parent);
 		}
+		return true;
 	},
 
 	updateItemInventorySorter(item: Item, changes, options: any, userId: string) {
 		if (!game.settings.get(CONSTANTS.MODULE_NAME, "enableInventorySorter")) {
-			return;
+			return false;
+		}
+		const user = game.users?.get(userId);
+		if (!user?.character) {
+			debug(`Can't reorder you need to set a actor to the game user`);
+			return false;
+		}
+		if (user.character.id !== (<Actor>item.parent).id) {
+			debug(`Can't reorder you can order ONLY the actor connected to the game user`);
+			return false;
 		}
 		if (userId === game.userId) {
 			if (!options.inventorySorterUpdate) {
 				delayedSort(<Actor>item.parent);
 			}
 		}
+		return true;
 	},
 
 	renderActorSheetEnableInventorySorter(actorSheet: ActorSheet, html, data) {
 		if (!game.settings.get(CONSTANTS.MODULE_NAME, "enableInventorySorter")) {
-			return;
+			return false;
+		}
+		const user = game.user;
+		if (!user?.character) {
+			debug(`Can't reorder you need to set a actor to the game user`);
+			return false;
+		}
+		if (user.character.id !== actorSheet.actor.id) {
+			debug(`Can't reorder you can order ONLY the actor connected to the game user`);
+			return false;
 		}
 		if (actorSheet?.isEditable) {
 			const actor = actorSheet?.actor;
 			if (!sortedActors.has(actor.id)) {
 				delayedSort(actor);
 			}
 		}
+		return true;
 	},
 };