From 5278a96f24275fc41e4da2136991ac07d42c6dbd Mon Sep 17 00:00:00 2001
From: Wlowscha <54003515+Wlowscha@users.noreply.github.com>
Date: Mon, 9 Jun 2025 16:20:21 +0200
Subject: [PATCH] pokemon.getHeldItems now uses heldItemManager

---
 src/field/pokemon-held-item-manager.ts |  2 +-
 src/field/pokemon.ts                   | 10 ++--------
 src/ui/summary-ui-handler.ts           |  2 +-
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/field/pokemon-held-item-manager.ts b/src/field/pokemon-held-item-manager.ts
index 564b01e3a41..88e025599d5 100644
--- a/src/field/pokemon-held-item-manager.ts
+++ b/src/field/pokemon-held-item-manager.ts
@@ -31,7 +31,7 @@ export class PokemonItemManager {
     this.heldItems = {};
   }
 
-  getHeldItemKeys(): number[] {
+  getHeldItems(): number[] {
     return Object.keys(this.heldItems).map(k => Number(k));
   }
 
diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts
index a29b44bd03f..5c92f83f7f7 100644
--- a/src/field/pokemon.ts
+++ b/src/field/pokemon.ts
@@ -1198,14 +1198,8 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     this.setScale(this.getSpriteScale());
   }
 
-  getHeldItems(): PokemonHeldItemModifier[] {
-    if (!globalScene) {
-      return [];
-    }
-    return globalScene.findModifiers(
-      m => m instanceof PokemonHeldItemModifier && m.pokemonId === this.id,
-      this.isPlayer(),
-    ) as PokemonHeldItemModifier[];
+  getHeldItems(): HeldItemId[] {
+    return this.heldItemManager.getHeldItems();
   }
 
   updateScale(): void {
diff --git a/src/ui/summary-ui-handler.ts b/src/ui/summary-ui-handler.ts
index a6d3d805a48..dfd12c56252 100644
--- a/src/ui/summary-ui-handler.ts
+++ b/src/ui/summary-ui-handler.ts
@@ -1050,7 +1050,7 @@ export default class SummaryUiHandler extends UiHandler {
           icon.on("pointerout", () => globalScene.ui.hideTooltip());
         });
 
-        const heldItemKeys = this.pokemon?.heldItemManager.getHeldItemKeys();
+        const heldItemKeys = this.pokemon?.heldItemManager.getHeldItems();
         // TODO: Sort them
         //.sort(heldItemSortFunc);