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

Fix remaining timer not being displayed properly (#970)

Browse Source
This commit is contained in:
asgdf
2017-07-14 13:48:26 +02:00
committed by Guangcong Luo
parent b903aff1b6
commit 3eb3e92ade
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
js/battle.js
View File

@@ -6352,16 +6352,16 @@ var Battle = (function () {
break;
case 'inactive':
if (!this.kickingInactive) this.kickingInactive = true;
if (args[0].slice(0, 9) === "You have ") {
if (args[1].slice(0, 9) === "You have ") {
// this is ugly but parseInt is documented to work this way
// so I'm going to be lazy and not chop off the rest of the
// sentence
this.kickingInactive = parseInt(args[0].slice(9), 10) || true;
this.kickingInactive = parseInt(args[1].slice(9), 10) || true;
return;
} else if (args[0].slice(-14) === ' seconds left.') {
var hasIndex = args[0].indexOf(' has ');
if (toId(args[0].slice(0, hasIndex)) === app.user.get('userid')) {
this.kickingInactive = parseInt(args[0].slice(hasIndex + 5), 10) || true;
} else if (args[1].slice(-14) === ' seconds left.') {
var hasIndex = args[1].indexOf(' has ');
if (toId(args[1].slice(0, hasIndex)) === app.user.get('userid')) {
this.kickingInactive = parseInt(args[1].slice(hasIndex + 5), 10) || true;
}
}
this.log('<div class="chat message-error">' + Tools.escapeHTML(args[1]) + '</div>', preempt);