From 2328c265507e75a027b0ab29998aa080f07a8864 Mon Sep 17 00:00:00 2001
From: Melledy <121644117+Melledy@users.noreply.github.com>
Date: Wed, 8 Nov 2023 22:27:12 -0800
Subject: [PATCH] Refactor how challenges handle dead avatars

---
 .../java/emu/lunarcore/game/challenge/ChallengeInstance.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/java/emu/lunarcore/game/challenge/ChallengeInstance.java b/src/main/java/emu/lunarcore/game/challenge/ChallengeInstance.java
index 39d4178..d8330b2 100644
--- a/src/main/java/emu/lunarcore/game/challenge/ChallengeInstance.java
+++ b/src/main/java/emu/lunarcore/game/challenge/ChallengeInstance.java
@@ -1,7 +1,6 @@
 package emu.lunarcore.game.challenge;
 
 import dev.morphia.annotations.Entity;
-
 import emu.lunarcore.data.GameData;
 import emu.lunarcore.data.excel.ChallengeExcel;
 import emu.lunarcore.game.battle.Battle;
@@ -82,8 +81,8 @@ public class ChallengeInstance {
     public void onBattleFinish(Battle battle, BattleEndStatus result, BattleStatistics stats) {
         if (result == BattleEndStatus.BATTLE_END_WIN) {
             // Check if any avatar in the lineup has died
-            player.getCurrentLineup().forEachAvatar(avatar -> {
-                if (!avatar.isAlive()) {
+            battle.getLineup().forEachAvatar(avatar -> {
+                if (avatar.getCurrentHp(battle.getLineup()) <= 0) {
                     hasAvatarDied = true;
                 }
             });