Commit a8163b5c authored by nanahira's avatar nanahira

fix

parent 51c82027
...@@ -825,7 +825,7 @@ class Room ...@@ -825,7 +825,7 @@ class Room
#else #else
# log.info 'SCORE POST OK', response.statusCode, response.statusMessage, @name, body # log.info 'SCORE POST OK', response.statusCode, response.statusMessage, @name, body
return return
if settings.modules.challonge.enabled and @started if settings.modules.challonge.enabled and @started and !@kicked
challonge.matches.update({ challonge.matches.update({
id: settings.modules.challonge.tournament_id, id: settings.modules.challonge.tournament_id,
matchId: @challonge_info.id, matchId: @challonge_info.id,
...@@ -1838,12 +1838,12 @@ ygopro.stoc_follow 'GAME_MSG', true, (buffer, info, client, server)-> ...@@ -1838,12 +1838,12 @@ ygopro.stoc_follow 'GAME_MSG', true, (buffer, info, client, server)->
room.winner_name = room.dueling_players[pos].name room.winner_name = room.dueling_players[pos].name
#log.info room.dueling_players, pos #log.info room.dueling_players, pos
room.scores[room.winner_name] = room.scores[room.winner_name] + 1 room.scores[room.winner_name] = room.scores[room.winner_name] + 1
if settings.modules.challonge.enabled if settings.modules.challonge.enabled and !room.kicked
if room.scores[room.dueling_players[0].name] > room.scores[room.dueling_players[1].name] if room.scores[room.dueling_players[0].name] > room.scores[room.dueling_players[1].name]
room.challonge_duel_log.winnerId = room.dueling_players[0].challonge_info.id room.challonge_duel_log.winnerId = room.dueling_players[0].challonge_info.id
else if room.scores[room.dueling_players[0].name] < room.scores[room.dueling_players[1].name] else if room.scores[room.dueling_players[0].name] < room.scores[room.dueling_players[1].name]
room.challonge_duel_log.winnerId = room.dueling_players[1].challonge_info.id room.challonge_duel_log.winnerId = room.dueling_players[1].challonge_info.id
else if room.scores[room.dueling_players[0].name] != 0 or room.scores[room.dueling_players[1].name] != 0 else
room.challonge_duel_log.winnerId = "tie" room.challonge_duel_log.winnerId = "tie"
if settings.modules.challonge.post_detailed_score if settings.modules.challonge.post_detailed_score
if room.dueling_players[0].challonge_info.id == room.challonge_info.player1Id and room.dueling_players[1].challonge_info.id == room.challonge_info.player2Id if room.dueling_players[0].challonge_info.id == room.challonge_info.player1Id and room.dueling_players[1].challonge_info.id == room.challonge_info.player2Id
...@@ -2798,6 +2798,7 @@ if settings.modules.http ...@@ -2798,6 +2798,7 @@ if settings.modules.http
if room.started if room.started
room.scores[room.dueling_players[0].name] = 0 room.scores[room.dueling_players[0].name] = 0
room.scores[room.dueling_players[1].name] = 0 room.scores[room.dueling_players[1].name] = 0
room.kicked = true
room.process.kill() room.process.kill()
room.delete() room.delete()
response.writeHead(200) response.writeHead(200)
......
...@@ -1066,7 +1066,7 @@ ...@@ -1066,7 +1066,7 @@
})(this)); })(this));
} }
} }
if (settings.modules.challonge.enabled && this.started) { if (settings.modules.challonge.enabled && this.started && !this.kicked) {
challonge.matches.update({ challonge.matches.update({
id: settings.modules.challonge.tournament_id, id: settings.modules.challonge.tournament_id,
matchId: this.challonge_info.id, matchId: this.challonge_info.id,
...@@ -2212,12 +2212,12 @@ ...@@ -2212,12 +2212,12 @@
room.winner_name = room.dueling_players[pos].name; room.winner_name = room.dueling_players[pos].name;
room.scores[room.winner_name] = room.scores[room.winner_name] + 1; room.scores[room.winner_name] = room.scores[room.winner_name] + 1;
} }
if (settings.modules.challonge.enabled) { if (settings.modules.challonge.enabled && !room.kicked) {
if (room.scores[room.dueling_players[0].name] > room.scores[room.dueling_players[1].name]) { if (room.scores[room.dueling_players[0].name] > room.scores[room.dueling_players[1].name]) {
room.challonge_duel_log.winnerId = room.dueling_players[0].challonge_info.id; room.challonge_duel_log.winnerId = room.dueling_players[0].challonge_info.id;
} else if (room.scores[room.dueling_players[0].name] < room.scores[room.dueling_players[1].name]) { } else if (room.scores[room.dueling_players[0].name] < room.scores[room.dueling_players[1].name]) {
room.challonge_duel_log.winnerId = room.dueling_players[1].challonge_info.id; room.challonge_duel_log.winnerId = room.dueling_players[1].challonge_info.id;
} else if (room.scores[room.dueling_players[0].name] !== 0 || room.scores[room.dueling_players[1].name] !== 0) { } else {
room.challonge_duel_log.winnerId = "tie"; room.challonge_duel_log.winnerId = "tie";
} }
if (settings.modules.challonge.post_detailed_score) { if (settings.modules.challonge.post_detailed_score) {
...@@ -3545,6 +3545,7 @@ ...@@ -3545,6 +3545,7 @@
room.scores[room.dueling_players[0].name] = 0; room.scores[room.dueling_players[0].name] = 0;
room.scores[room.dueling_players[1].name] = 0; room.scores[room.dueling_players[1].name] = 0;
} }
room.kicked = true;
room.process.kill(); room.process.kill();
room["delete"](); room["delete"]();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment