Bounds check on invalid encounter

Magmortar from Gen3 in Gen4+ somehow requests learnset; just give it species 0.
kwsch · Feb 26, 2024 · aa841ae · aa841ae
1 parent 645d65b
commit aa841ae
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/PKHeX.Core/Legality/LearnSource/Sources/LearnSource1RB.cs b/PKHeX.Core/Legality/LearnSource/Sources/LearnSource1RB.cs
@@ -17,7 +17,7 @@ public sealed class LearnSource1RB : ILearnSource<PersonalInfo1>
     private const LearnEnvironment Game = RB;
     private const int MaxSpecies = Legal.MaxSpeciesID_1;
 
-    public Learnset GetLearnset(ushort species, byte form) => Learnsets[species];
+    public Learnset GetLearnset(ushort species, byte form) => Learnsets[species < Learnsets.Length ? species : 0];
 
     public bool TryGetPersonal(ushort species, byte form, [NotNullWhen(true)] out PersonalInfo1? pi)
     {

diff --git a/PKHeX.Core/Legality/LearnSource/Sources/LearnSource1YW.cs b/PKHeX.Core/Legality/LearnSource/Sources/LearnSource1YW.cs
@@ -17,7 +17,7 @@ public sealed class LearnSource1YW : ILearnSource<PersonalInfo1>
     private const LearnEnvironment Game = YW;
     private const int MaxSpecies = Legal.MaxSpeciesID_1;
 
-    public Learnset GetLearnset(ushort species, byte form) => Learnsets[species];
+    public Learnset GetLearnset(ushort species, byte form) => Learnsets[species < Learnsets.Length ? species : 0];
 
     public bool TryGetPersonal(ushort species, byte form, [NotNullWhen(true)] out PersonalInfo1? pi)
     {

diff --git a/PKHeX.Core/Legality/LearnSource/Sources/LearnSource2C.cs b/PKHeX.Core/Legality/LearnSource/Sources/LearnSource2C.cs
@@ -18,7 +18,7 @@ public sealed class LearnSource2C : ILearnSource<PersonalInfo2>, IEggSource
     private const int MaxSpecies = Legal.MaxSpeciesID_2;
     private const LearnEnvironment Game = C;
 
-    public Learnset GetLearnset(ushort species, byte form) => Learnsets[species];
+    public Learnset GetLearnset(ushort species, byte form) => Learnsets[species < Learnsets.Length ? species : 0];
 
     public bool TryGetPersonal(ushort species, byte form, [NotNullWhen(true)] out PersonalInfo2? pi)
     {

diff --git a/PKHeX.Core/Legality/LearnSource/Sources/LearnSource2GS.cs b/PKHeX.Core/Legality/LearnSource/Sources/LearnSource2GS.cs
@@ -18,7 +18,7 @@ public sealed class LearnSource2GS : ILearnSource<PersonalInfo2>, IEggSource
     private const int MaxSpecies = Legal.MaxSpeciesID_2;
     private const LearnEnvironment Game = GS;
 
-    public Learnset GetLearnset(ushort species, byte form) => Learnsets[species];
+    public Learnset GetLearnset(ushort species, byte form) => Learnsets[species < Learnsets.Length ? species : 0];
 
     public bool TryGetPersonal(ushort species, byte form, [NotNullWhen(true)] out PersonalInfo2? pi)
     {

diff --git a/PKHeX.Core/Legality/LearnSource/Sources/LearnSource3E.cs b/PKHeX.Core/Legality/LearnSource/Sources/LearnSource3E.cs
@@ -18,7 +18,7 @@ public sealed class LearnSource3E : LearnSource3, ILearnSource<PersonalInfo3>, I
     private const byte Generation = 3;
     private const int CountTM = 50;
 
-    public Learnset GetLearnset(ushort species, byte form) => Learnsets[species];
+    public Learnset GetLearnset(ushort species, byte form) => Learnsets[species < Learnsets.Length ? species : 0];
     internal PersonalInfo3 this[ushort species] => Personal[species];
 
     public bool TryGetPersonal(ushort species, byte form, [NotNullWhen(true)] out PersonalInfo3? pi)

diff --git a/PKHeX.Core/Legality/LearnSource/Sources/LearnSource3FR.cs b/PKHeX.Core/Legality/LearnSource/Sources/LearnSource3FR.cs
@@ -18,7 +18,7 @@ public sealed class LearnSource3FR : LearnSource3, ILearnSource<PersonalInfo3>,
     private const byte Generation = 3;
     private const int CountTM = 50;
 
-    public Learnset GetLearnset(ushort species, byte form) => Learnsets[species];
+    public Learnset GetLearnset(ushort species, byte form) => Learnsets[species < Learnsets.Length ? species : 0];
     internal PersonalInfo3 this[ushort species] => Personal[species];
 
     public bool TryGetPersonal(ushort species, byte form, [NotNullWhen(true)] out PersonalInfo3? pi)

diff --git a/PKHeX.Core/Legality/LearnSource/Sources/LearnSource3LG.cs b/PKHeX.Core/Legality/LearnSource/Sources/LearnSource3LG.cs
@@ -18,7 +18,7 @@ public sealed class LearnSource3LG : LearnSource3, ILearnSource<PersonalInfo3>,
     private const byte Generation = 3;
     private const int CountTM = 50;
 
-    public Learnset GetLearnset(ushort species, byte form) => Learnsets[species];
+    public Learnset GetLearnset(ushort species, byte form) => Learnsets[species < Learnsets.Length ? species : 0];
     internal PersonalInfo3 this[ushort species] => Personal[species];
 
     public bool TryGetPersonal(ushort species, byte form, [NotNullWhen(true)] out PersonalInfo3? pi)

diff --git a/PKHeX.Core/Legality/LearnSource/Sources/LearnSource3RS.cs b/PKHeX.Core/Legality/LearnSource/Sources/LearnSource3RS.cs
@@ -18,7 +18,7 @@ public sealed class LearnSource3RS : LearnSource3, ILearnSource<PersonalInfo3>,
     private const byte Generation = 3;
     private const int CountTM = 50;
 
-    public Learnset GetLearnset(ushort species, byte form) => Learnsets[species];
+    public Learnset GetLearnset(ushort species, byte form) => Learnsets[species < Learnsets.Length ? species : 0];
 
     public bool TryGetPersonal(ushort species, byte form, [NotNullWhen(true)] out PersonalInfo3? pi)
     {