Defer gen1/2 trades to end

like prior commit, OT checks
Closes #1391
This commit is contained in:
Kurt 2017-08-10 23:23:02 -07:00
parent de11b8e375
commit 2340c829ad

View file

@ -94,6 +94,11 @@ namespace PKHeX.Core
var deferred = new List<IEncounterable>();
foreach (var t in GetValidEncounterTrades(pkm, game))
{
if (pkm.Format >= 7)
{
deferred.Add(t);
continue;
}
yield return new GBEncounterData(pkm, gen, t, game);
}
foreach (var s in GetValidStaticEncounter(pkm, game).Where(z => species.Contains(z.Species)))