From 5f01c13533726d7a18e2c1b78790c0112ed15a79 Mon Sep 17 00:00:00 2001 From: Bill Meltsner Date: Tue, 29 Oct 2013 02:09:35 -0700 Subject: [PATCH] Fix parseDetails erroring when passed nil details --- js/battle.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/js/battle.js b/js/battle.js index 2d3c746de..b19000ed7 100644 --- a/js/battle.js +++ b/js/battle.js @@ -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;