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

Fix decisions being sent twice

Browse Source
This commit is contained in:
Ivo Julca
2016-11-19 17:53:39 -05:00
parent 7f3762a0f7
commit 4e9a1eedcb
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
js/client-battle.js
View File

@@ -846,13 +846,6 @@
return buf;
},
decide: function (message) {
if (this.partialDecisions) return this.sendDecision(message);
if (this.choice.choices.length >= (this.choice.count || this.battle.mySide.active.length)) {
return this.sendDecision(this.choice.choices);
}
},
// Appends the rqid to the message so that the server can
// verify that the decision is sent in response to the correct request.
sendDecision: function (message) {
@@ -1162,9 +1155,14 @@
}
}
for (var i = 0; i < this.choice.choices.length; i++) {
this.decide(this.choice.choices[i]);
if (this.partialDecisions) {
for (var i = 0; i < this.choice.choices.length; i++) {
this.sendDecision(this.choice.choices[i]);
}
} else if (this.choice.choices.length >= (this.choice.count || this.battle.mySide.active.length)) {
this.sendDecision(this.choice.choices);
}
if (!this.finalDecision) {
var lastChoice = this.choice.choices[this.choice.choices.length - 1];
if (lastChoice.substr(0, 5) === 'move ' && this.finalDecisionMove) {