diff --git a/PKHeX/Legality/Core.cs b/PKHeX/Legality/Core.cs index 22ae63ed1..86f384ac6 100644 --- a/PKHeX/Legality/Core.cs +++ b/PKHeX/Legality/Core.cs @@ -282,7 +282,8 @@ internal static EncounterStatic getValidStaticEncounter(PKM pkm, bool gen1Encoun IEnumerable poss = getStaticEncounters(pkm); int lvl = (pkm.HasOriginalMetLocation) ? pkm.Met_Level : getMaxLevelGeneration(pkm); - + if (lvl <= 0) + return null; ; // Back Check against pkm foreach (EncounterStatic e in poss) { @@ -329,7 +330,8 @@ internal static EncounterTrade getValidIngameTrade(PKM pkm, bool gen1Encounter = return null; int lvl = (pkm.HasOriginalMetLocation) ? pkm.Met_Level : getMaxLevelGeneration(pkm); - + if (lvl <= 0) + return lvl; // Get valid pre-evolutions IEnumerable p = getValidPreEvolutions(pkm); @@ -1086,6 +1088,8 @@ private static IEnumerable getValidEncounterSlots(PKM pkm, Encoun IEnumerable slots = loc.Slots.Where(slot => vs.Any(evo => evo.Species == slot.Species && (ignoreSlotLevel || evo.Level >= slot.LevelMin - df))); int lvl = (pkm.HasOriginalMetLocation) ? pkm.Met_Level: getMaxLevelGeneration(pkm); + if (lvl <= 0) + return slotdata; int gen = pkm.GenNumber; IEnumerable encounterSlots; if(pkm.HasOriginalMetLocation)