Leahnaya/pokemon-showdown-client
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown-client.git synced 2026-10-26 12:17:36 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix crash when something happens to fainted Pokemon

Browse Source
This commit is contained in:
Guangcong Luo
2017-09-06 15:44:11 -04:00
parent 4688121d15
commit b3506abcf3
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
js/battle.js
View File

@@ -338,6 +338,9 @@ var Pokemon = (function () {
};
Pokemon.prototype.checkDetails = function (details) {
if (!details) return false;
if (details.indexOf(', shiny') >= 0) {
if (this.checkDetails(details.replace(', shiny', ''))) return true;
}
if (details === this.details) return true;
// the actual forme was hidden on Team Preview
details = details.replace(/-[A-Za-z0-9]+(, |$)/, '$1');
@@ -6108,8 +6111,7 @@ var Battle = (function () {
if (slot >= 0) pokemon.slot = slot;
return pokemon;
}
if (!pokemon.searchid && (pokemon.checkDetails(details) || // switch-in matches Team Preview entry
pokemon.checkDetails(details.replace(', shiny', '')))) { // switch-in matches non-shiny Team Preview entry
if (!pokemon.searchid && pokemon.checkDetails(details)) { // switch-in matches Team Preview entry
pokemon = this.p1.newPokemon(this.parseDetails(name, pokemonid, details), i);
if (slot >= 0) pokemon.slot = slot;
return pokemon;
@@ -6135,8 +6137,7 @@ var Battle = (function () {
if (slot >= 0) pokemon.slot = slot;
return pokemon;
}
if (!pokemon.searchid && (pokemon.checkDetails(details) || // switch-in matches Team Preview entry
pokemon.checkDetails(details.replace(', shiny', '')))) { // switch-in matches non-shiny Team Preview entry
if (!pokemon.searchid && pokemon.checkDetails(details)) { // switch-in matches Team Preview entry
pokemon = this.p2.newPokemon(this.parseDetails(name, pokemonid, details), i);
if (slot >= 0) pokemon.slot = slot;
return pokemon;