From bde561d4c0e1f2fd53e9e3ac629096cd403be979 Mon Sep 17 00:00:00 2001
From: Kyle Kemp <kyle@seiyria.com>
Date: Tue, 26 Sep 2023 17:28:50 -0500
Subject: [PATCH] fix(combat): fix npe for post-combat items

---
 client/src/app/pages/explore/explore.page.html | 2 +-
 server/src/modules/fight/fight.service.ts      | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/client/src/app/pages/explore/explore.page.html b/client/src/app/pages/explore/explore.page.html
index e72e4cb..b6f5f36 100644
--- a/client/src/app/pages/explore/explore.page.html
+++ b/client/src/app/pages/explore/explore.page.html
@@ -205,7 +205,7 @@
                               <div class="formation-count">
                                 {{
                                 actionInfo.actionData.formation.monsters.length
-                                }} monsters
+                                }} monster(s)
                               </div>
                             </ion-col>
                           </ion-row>
diff --git a/server/src/modules/fight/fight.service.ts b/server/src/modules/fight/fight.service.ts
index e2a3593..24b6f89 100644
--- a/server/src/modules/fight/fight.service.ts
+++ b/server/src/modules/fight/fight.service.ts
@@ -4,6 +4,7 @@ import {
   ICombatTargetParams,
   IFightCharacter,
   IFightTile,
+  IItem,
   IMonster,
   IMonsterFormation,
   TrackedStat,
@@ -349,14 +350,16 @@ export class FightService {
         .filter(Boolean),
     );
 
-    let randomDrop;
+    let randomDrop: IItem | undefined;
 
     if (
       randomDropPossibility &&
       random(0, 100) <= randomDropPossibility.chance
     ) {
       randomDrop = this.contentService.getItem(randomDropPossibility.item);
-      addStatusMessage(fight, 'Fight', `You found "${randomDrop.name}"!`);
+      if (randomDrop) {
+        addStatusMessage(fight, 'Fight', `You found "${randomDrop.name}"!`);
+      }
     }
 
     if (isWin && fight.defenders.length > 0) {
@@ -368,7 +371,7 @@ export class FightService {
       `Fight ${
         fight.internalId
       } rewarded ${xpDelta} XP and ${coinDelta} coins and ${
-        randomDrop?.item ?? 'no'
+        randomDrop?.name ?? 'no'
       } item drop.`,
     );