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

Don't treat locked moves as called moves

Browse Source
This commit is contained in:
Guangcong Luo
2015-08-01 00:53:01 -04:00
parent cf1e96390f
commit caacd8a98d
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
js/battle.js
View File

@@ -5608,7 +5608,7 @@ var Battle = (function () {
break;
case 'move':
this.endLastTurn();
if (!kwargs.from && this.waitForResult()) return;
if ((!kwargs.from || kwargs.from === 'lockedmove') && this.waitForResult()) return;
var poke = this.getPokemon(args[1]);
var move = Tools.getMove(args[2]);
if (this.checkActive(poke)) return;