From 3876b3b1fa044ae3f76c792976bf2cbd197b15d7 Mon Sep 17 00:00:00 2001 From: Kurt Date: Mon, 8 Feb 2021 08:29:18 -0800 Subject: [PATCH] Allow traded egg while still egg Closes #3144 --- .../Legality/Encounters/EncounterStatic/EncounterStatic.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic.cs b/PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic.cs index 718e8bffc..4bda213e6 100644 --- a/PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic.cs +++ b/PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic.cs @@ -255,8 +255,10 @@ protected virtual bool IsMatchEggLocation(PKM pkm) { if (pkm.IsEgg) // unhatched { - if (EggLocation != pkm.Met_Location) + if (!EggEncounter) return false; + if (EggLocation != pkm.Met_Location) + return pkm.Met_Location == Locations.LinkTrade6 && pkm.Egg_Location == EggLocation; return pkm.Egg_Location == 0; }