From 75a4b259e4c501979e584f83c8abe7dea74fe334 Mon Sep 17 00:00:00 2001
From: moonysolari <118079569+moonysolari@users.noreply.github.com>
Date: Sat, 22 Apr 2023 05:13:26 -0400
Subject: [PATCH] Fixed a nullability issue (#243)

---
 components/evergreen.ts | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/components/evergreen.ts b/components/evergreen.ts
index a557f52d..91726758 100644
--- a/components/evergreen.ts
+++ b/components/evergreen.ts
@@ -20,6 +20,7 @@ import { getUserData, writeUserData } from "./databaseHandler"
 import { getConfig } from "./configSwizzleManager"
 import { ContractProgressionData } from "./types/types"
 import { getFlag } from "./flags"
+import { EVERGREEN_LEVEL_INFO } from "./utils"
 
 export async function setCpd(
     data: ContractProgressionData,
@@ -48,20 +49,13 @@ export async function getCpd(
             false,
         ) as ContractProgressionData
 
-        //NOTE: Override the EvergreenLevel with the latest Mastery Level
-        if (getFlag("gameplayUnlockAllFreelancerMasteries")) {
-            //TODO: Get rid of hardcoded values
-            userData.Extensions.CPD[cpdID]["EvergreenLevel"] = 100
-        }
-
         await setCpd(defaultCPD, uID, cpdID)
-        return defaultCPD
     }
 
     //NOTE: Override the EvergreenLevel with the latest Mastery Level
     if (getFlag("gameplayUnlockAllFreelancerMasteries")) {
-        //TODO: Get rid of hardcoded values
-        userData.Extensions.CPD[cpdID]["EvergreenLevel"] = 100
+        userData.Extensions.CPD[cpdID]["EvergreenLevel"] =
+            EVERGREEN_LEVEL_INFO.length
     }
 
     return userData.Extensions.CPD[cpdID]