From 6d8d6b775821c88db209909698d7d8ae8d835aba Mon Sep 17 00:00:00 2001
From: javierhimura <javier_himura@hotmail.com>
Date: Mon, 27 Mar 2017 00:48:50 +0200
Subject: [PATCH] Ignore NonEgg Encounter for gen 3 illegal transfer unhatched
 eggs

---
 PKHeX/Legality/Checks.cs | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/PKHeX/Legality/Checks.cs b/PKHeX/Legality/Checks.cs
index 474e205b5..9cafc3f91 100644
--- a/PKHeX/Legality/Checks.cs
+++ b/PKHeX/Legality/Checks.cs
@@ -722,6 +722,11 @@ namespace PKHeX.Core
             if (pkm.WasLink)
                 return verifyEncounterLink();
 
+            if (pkm.Gen3 && !pkm.HasOriginalMetLocation)
+            {
+                return verifyEncounterG3Transfer();
+            }
+
             bool wasEvent = pkm.WasEvent || pkm.WasEventEgg;
             if (wasEvent)
             {
@@ -730,11 +735,6 @@ namespace PKHeX.Core
                     return result;
             }
 
-            if (pkm.Gen3 && !pkm.HasOriginalMetLocation)
-            {
-                return verifyEncounterG3Transfer();
-            }
-
             if (null != (EncounterMatch = Legal.getValidStaticEncounter(pkm)))
             {
                 var result = verifyEncounterStatic();
@@ -770,8 +770,11 @@ namespace PKHeX.Core
             {
                 pkm.WasEgg = true;
                 EggResult = verifyEncounterEgg3Transfer();
+                if (pkm.IsEgg)
+                    return EggResult;
             }
 
+            // TODO: Include also gen 3 events
             if (null != (EncounterMatch = Legal.getValidStaticEncounter(pkm)))
             {
                 NonEggResult = verifyEncounterStatic();