Skip to content

Commit a025c89

Browse files
committed
Fixed error being thrown if form number is out of index.
1 parent 6afc442 commit a025c89

3 files changed

Lines changed: 28 additions & 8 deletions

File tree

coreconsole/Tests/SummaryTest.cs

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,13 @@ public void CanGetPokemonSummary()
4141
// "93376e1600009bec650300009bbc892640420f00af001200000000007ad56b4f0a0a04000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000788100000000000041006c006300720065006d00690065000000000000000000000021005502ba00090323140a0f0000000021005502000000000f013ffcff370a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002c000000020000000000ff00000000000000000000000000000053006c0065006500700079000000000000000000000000000000a40513001d000715071d15071d0062ea280004810000000000000000000000000000000000000000000000000000000000000000000064000f017100ba00b400000112010000";
4242
// const string a =
4343
// "000000000000bef065030000f87eb53840420f00a50014000000000051f74348121204000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000041006c006300720065006d006900650000000000680000000000760107019c005502102010200303030321005502000000000f01ffffff3f0a000000000000000000000000000000000000000000000050004b0048006500580000000000000000000000000000000000000201000000320000000000000000000000000000000000000000002d000000020000000000ff00000000000000000000000000000054006f006d000000580000000000000000000000000000000000000000000000001501061501060062ea4400040100000000000000000000000000000000000000000000000000000000000000000000";
44-
const string a =
45-
"1a9b12b00000701626020000537e0c70d8000000467800020000000000000000000000000000000021003700fd00000023190a0000000000b9227415000000000a13000000000000420061007300630075006c0069006e00ffff0000ffff001400000000000000004400650073006d0075006e006400ffff00000017021000000e00000406000000";
46-
var pkmnBytes = Helpers.StringToByteArray(a);
47-
var pkmn = EntityFormat.GetFromBytes(pkmnBytes, EntityContext.Gen3);
44+
// const string a =
45+
// "1a9b12b00000701626020000537e0c70d8000000467800020000000000000000000000000000000021003700fd00000023190a0000000000b9227415000000000a13000000000000420061007300630075006c0069006e00ffff0000ffff001400000000000000004400650073006d0075006e006400ffff00000017021000000e00000406000000";
46+
var pkmn = Helpers.PokemonFromBase64(
47+
"Wv//kAAADV2sAAAAXGjqBnhpAAAJAQAAWv//kAQKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEcAcgDpAGcAbwBpAHIAZQAAAAAAAAAAAAAADgFYAc8A3AAFBQUFAAAAAAAAAAAAAAAAAAD/UiCaQwBvAHIAZQB5AAAAAAAAAAAAAAAAAAAAAAAAAQYxAAAAAAAAAAAAAAAARgABBAcAAAAAAAAAAABTAEEAWQBGAAAAAAAAAAAAAAAAAAAAAAAAAEYAAAAAAAAAAAATCwIAAAAxdQQeAAgxBgEDAAAAAA==");
48+
49+
// var pkmnBytes = Helpers.StringToByteArray(a);
50+
// var pkmn = EntityFormat.GetFromBytes(pkmnBytes, EntityContext.Gen3);
4851

4952
// Get the summary
5053
var summary = Summary.GetSummary(pkmn!);

coreconsole/models/Sprites.cs

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,17 @@ private string ConstructSpeciesSprite(EntitySummary summary, PKM pkmn)
8989
{
9090
var checkBinding = true;
9191
var species = summary.Species.ToLower();
92-
var forms = FormConverter.GetFormList(pkmn.Species, GameInfo.Strings.types, GameInfo.Strings.forms,
93-
GameInfo.GenderSymbolASCII, pkmn.Context);
92+
string[] forms;
93+
try
94+
{
95+
forms = FormConverter.GetFormList(pkmn.Species, GameInfo.Strings.types, GameInfo.Strings.forms,
96+
GameInfo.GenderSymbolASCII, pkmn.Context);
97+
}
98+
catch (Exception e)
99+
{
100+
SentrySdk.CaptureException(e);
101+
return "";
102+
}
94103

95104
var path = $"{BaseUrl}";
96105

@@ -100,7 +109,16 @@ private string ConstructSpeciesSprite(EntitySummary summary, PKM pkmn)
100109
path += "pokemon-gen8/";
101110

102111
path += pkmn.IsShiny ? "shiny/" : "regular/";
103-
var form = (forms[pkmn.Form] ?? "").ToLower();
112+
string form;
113+
try
114+
{
115+
form = (forms[pkmn.Form] ?? "").ToLower();
116+
}
117+
catch (Exception e)
118+
{
119+
SentrySdk.CaptureException(e);
120+
form = "";
121+
}
104122

105123
if (SpeciesWithFemaleForms.Contains(species) && pkmn.Gender == 2)
106124
{

internal/models/requests.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ type GetInfoRequest struct {
66

77
type GetInfoRequestB64 struct {
88
Generation string `json:"generation" form:"generation" query:"generation" validate:"omitempty,oneof=Gen6 Gen7 Gen8 Gen8b"`
9-
Base64 string `json:"base64" form:"base64" query:"base64" validate:"required"`
109
}
1110

1211
type LegalityCheckRequest struct {

0 commit comments

Comments
 (0)