From acb5575e8a6f2d7d286b44e71d987d99a2671e63 Mon Sep 17 00:00:00 2001 From: xsn34kzx Date: Sun, 17 Nov 2024 12:22:31 -0500 Subject: [PATCH] Fix Imports, Use `isNullOrUndefined` --- src/system/version_migration/versions/v1_0_4.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/system/version_migration/versions/v1_0_4.ts b/src/system/version_migration/versions/v1_0_4.ts index d3b00ba0cae..768d366d25e 100644 --- a/src/system/version_migration/versions/v1_0_4.ts +++ b/src/system/version_migration/versions/v1_0_4.ts @@ -1,7 +1,8 @@ -import { SettingKeys } from "../../settings/settings"; +import { SettingKeys } from "#app/system/settings/settings"; import { AbilityAttr, defaultStarterSpecies, DexAttr, SystemSaveData, SessionSaveData } from "../../game-data"; -import { allSpecies } from "../../../data/pokemon-species"; +import { allSpecies } from "#app/data/pokemon-species"; import { CustomPokemonData } from "#app/data/custom-pokemon-data"; +import { isNullOrUndefined } from "#app/utils"; export const systemMigrators = [ /** @@ -150,7 +151,7 @@ export const sessionMigrators = [ pokemon["fusionMysteryEncounterPokemonData"] = null; } pokemon.customPokemonData = pokemon.customPokemonData ?? new CustomPokemonData(); - if (pokemon["natureOverride"] && pokemon["natureOverride"] >= 0) { + if (!isNullOrUndefined(pokemon["natureOverride"]) && pokemon["natureOverride"] >= 0) { pokemon.customPokemonData.nature = pokemon["natureOverride"]; pokemon["natureOverride"] = -1; }