Leahnaya/pokemon-showdown-client
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown-client.git synced 2026-05-31 21:22:20 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix parseDetails erroring when passed nil details

Browse Source
This commit is contained in:
Bill Meltsner 2013-10-29 02:09:35 -07:00
parent eada1ce8c0
commit 5f01c13533
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
js/battle.js
View File

@ -4401,6 +4401,7 @@ function Battle(frame, logFrame, noPreload) {
} */
this.parseDetails = function (name, pokemonid, details, output) {
if (!output) output = {};
if (!details) details = "";
output.details = details;
output.name = name;
output.species = name;
@ -4518,7 +4519,7 @@ function Battle(frame, logFrame, noPreload) {
pokemon.searchid = searchid;
pokemon.ident = pokemonid;
if (pokemon.needsReplace) {
pokemon = self.p1.newPokemon(self.parseDetails(name, pokemonid, details || ""), i);
pokemon = self.p1.newPokemon(self.parseDetails(name, pokemonid, details), i);
}
}
pokemon.slot = slot;