From 1fd5f6c01f1a70cdd32d3c5eb61da6f6c6b09a34 Mon Sep 17 00:00:00 2001
From: Flashfyre <flashfireex@gmail.com>
Date: Wed, 25 Oct 2023 09:12:39 -0400
Subject: [PATCH] Fix issues with held item transfer

---
 src/battle-scene.ts        | 2 +-
 src/ui/party-ui-handler.ts | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/battle-scene.ts b/src/battle-scene.ts
index ffe5a5a88..612486a66 100644
--- a/src/battle-scene.ts
+++ b/src/battle-scene.ts
@@ -1082,7 +1082,7 @@ export default class BattleScene extends Phaser.Scene {
 			const newItemModifier = itemModifier.clone() as PokemonHeldItemModifier;
 			newItemModifier.pokemonId = target.id;
 			const matchingModifier = target.scene.findModifier(m => m instanceof PokemonHeldItemModifier
-				&& (m as PokemonHeldItemModifier).matchType(itemModifier), target.isPlayer()) as PokemonHeldItemModifier;
+				&& (m as PokemonHeldItemModifier).matchType(itemModifier) && m.pokemonId === target.id, target.isPlayer()) as PokemonHeldItemModifier;
 			let removeOld = true;
 			if (matchingModifier) {
 				const maxStackCount = matchingModifier.getMaxStackCount();
diff --git a/src/ui/party-ui-handler.ts b/src/ui/party-ui-handler.ts
index 258af8ed4..2cf590932 100644
--- a/src/ui/party-ui-handler.ts
+++ b/src/ui/party-ui-handler.ts
@@ -153,8 +153,7 @@ export default class PartyUiHandler extends MessageUiHandler {
 
     this.fieldIndex = args.length > 1 ? args[1] as integer : -1;
 
-    if (args.length > 2 && args[2] instanceof Function)
-      this.selectCallback = args[2];
+    this.selectCallback = args.length > 2 && args[2] instanceof Function ? args[2] : undefined;
     this.selectFilter = args.length > 3 && args[3] instanceof Function
       ? args[3] as PokemonSelectFilter
       : PartyUiHandler.FilterAll;