From 1149845db5f35f52cc9770ff65c55801e4e56d60 Mon Sep 17 00:00:00 2001 From: Kurt Date: Wed, 20 Sep 2017 09:04:30 -0700 Subject: [PATCH] Misc database fixes Initialize move array for WC3 if none are present Closes #1472 More gracefully handle invalid version pkms in a given format (gen5 origin version pkm on gen4 format no longer throws an exception). --- PKHeX.Core/Legality/Encounters/VerifyCurrentMoves.cs | 2 +- PKHeX.Core/MysteryGifts/WC3.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/PKHeX.Core/Legality/Encounters/VerifyCurrentMoves.cs b/PKHeX.Core/Legality/Encounters/VerifyCurrentMoves.cs index 6bb0baecc..6309a4f2a 100644 --- a/PKHeX.Core/Legality/Encounters/VerifyCurrentMoves.cs +++ b/PKHeX.Core/Legality/Encounters/VerifyCurrentMoves.cs @@ -241,7 +241,7 @@ private static CheckMoveResult[] ParseMoves(PKM pkm, MoveParseSource source, Leg if (pkm.Format <= 2) generations = generations.Where(z => z < info.EncounterMoves.LevelUpMoves.Length).ToArray(); - int lastgen = generations.Last(); + int lastgen = generations.LastOrDefault(); foreach (var gen in generations) { ParseMovesByGeneration(pkm, res, gen, info, moveInfo, lastgen); diff --git a/PKHeX.Core/MysteryGifts/WC3.cs b/PKHeX.Core/MysteryGifts/WC3.cs index 8222754fa..db3441d80 100644 --- a/PKHeX.Core/MysteryGifts/WC3.cs +++ b/PKHeX.Core/MysteryGifts/WC3.cs @@ -20,7 +20,7 @@ public class WC3 : MysteryGift, IRibbonSetEvent3 public int Language { get; set; } = -1; public override int Species { get; set; } public override bool IsEgg { get; set; } - public override int[] Moves { get; set; } + public override int[] Moves { get; set; } = new int[0]; public bool NotDistributed { get; set; } public bool? Shiny { get; set; } // null = allow, false = never, true = always public bool Fateful { get; set; } // Obedience Flag