From 1e708a2102b49ef5d9d37f0b486246d65eb48bc2 Mon Sep 17 00:00:00 2001 From: Kurt Date: Sat, 24 Mar 2018 17:28:56 -0700 Subject: [PATCH] Simplify default met location fetch now that IGeneration is available, don't call pkm.GenNumber (slower) --- .../Legality/Encounters/Generator/EncounterTradeGenerator.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKHeX.Core/Legality/Encounters/Generator/EncounterTradeGenerator.cs b/PKHeX.Core/Legality/Encounters/Generator/EncounterTradeGenerator.cs index bad02d1de..81ea785b9 100644 --- a/PKHeX.Core/Legality/Encounters/Generator/EncounterTradeGenerator.cs +++ b/PKHeX.Core/Legality/Encounters/Generator/EncounterTradeGenerator.cs @@ -159,7 +159,7 @@ private static bool IsEncounterTradeValid(PKM pkm, EncounterTrade z, int lvl) return false; if (pkm.HasOriginalMetLocation) { - var loc = z.Location > 0 ? z.Location : EncounterTrade.DefaultMetLocation[pkm.GenNumber - 1]; + var loc = z.Location > 0 ? z.Location : EncounterTrade.DefaultMetLocation[z.Generation - 1]; if (loc != pkm.Met_Location) return false; if (pkm.Format < 5)