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

Fix the U-turn race condition bug

Browse Source
This commit is contained in:
Guangcong Luo 2012-06-22 14:35:10 -07:00
parent 213716dacf
commit b9071e6ded
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
simulator.js
View File

@ -2344,14 +2344,6 @@ function Battle(roomid, format, rated) {
selfB.curCallback = '';
}
if (selfB.p1.decision && selfB.p1.decision !== true) {
selfB.addQueue(selfB.p1.decision, true);
selfB.p1.decision = true;
}
if (selfB.p2.decision && selfB.p2.decision !== true) {
selfB.addQueue(selfB.p2.decision, true);
selfB.p2.decision = true;
}
if (!selfB.midTurn) {
selfB.queue.push({choice:'residual', priority: -100});
selfB.queue.push({choice:'beforeTurn', priority: 100});
@ -2393,6 +2385,9 @@ function Battle(roomid, format, rated) {
selfB.addQueue(decision);
};
this.decision = function(user, choice, data, recurse) {
if (!selfB.decisionWaiting) {
return;
}
if (!recurse) recurse = 0;
if (recurse > 2) {
console.log('infinite recursion; breaking');
@ -2406,12 +2401,15 @@ function Battle(roomid, format, rated) {
if (!user.sides[selfB.roomid]) return; // wtf
var side = user.sides[selfB.roomid];
var decision = {side: side, choice: choice, priority: 0, speed: 0};
selfB.cancelDecision(side.active[0]);
if (side.decision === true) {
// Don't change a decision if it's not your turn
return;
}
// I believe this is outdated code that has no effect besides
// exacerbating race conditions
//selfB.cancelDecision(side.active[0]);
if (choice === 'undo') {
if (side.decision !== true) {
// Don't undo a decision if it's not your turn
side.decision = null;
}
side.decision = null;
return;
} else if (choice === 'team') {
if (selfB.curCallback !== 'team-preview') {
@ -2500,6 +2498,14 @@ function Battle(roomid, format, rated) {
}
if (selfB.p1.decision && selfB.p2.decision) {
selfB.decisionWaiting = false;
if (selfB.p1.decision !== true) {
selfB.addQueue(selfB.p1.decision, true);
}
if (selfB.p2.decision !== true) {
selfB.addQueue(selfB.p2.decision, true);
}
selfB.p1.decision = true;
selfB.p2.decision = true;
selfB.go();
}
};