Commit 6ab4630a authored by nanahira's avatar nanahira

Revert "test fix to leaving room"

This reverts commit 7099842b.
parent 9680fea7
...@@ -1364,7 +1364,8 @@ class Room ...@@ -1364,7 +1364,8 @@ class Room
@arena_score_handled = true @arena_score_handled = true
index = _.indexOf(@players, client) index = _.indexOf(@players, client)
@players.splice(index, 1) unless index == -1 @players.splice(index, 1) unless index == -1
if @started and !@finished and @disconnector != 'server' and client.pos < 4 and !client.system_kicked if @started and @disconnector != 'server' and client.pos < 4
@finished = true
if !@finished_by_death if !@finished_by_death
@scores[client.name_vpass] = -9 @scores[client.name_vpass] = -9
if @random_type and not client.flee_free and (!settings.modules.reconnect.enabled or @get_disconnected_count() == 0) if @random_type and not client.flee_free and (!settings.modules.reconnect.enabled or @get_disconnected_count() == 0)
...@@ -2383,7 +2384,6 @@ ygopro.stoc_follow 'GAME_MSG', true, (buffer, info, client, server, datas)-> ...@@ -2383,7 +2384,6 @@ ygopro.stoc_follow 'GAME_MSG', true, (buffer, info, client, server, datas)->
delete room.long_resolve_card delete room.long_resolve_card
delete room.long_resolve_chain delete room.long_resolve_chain
if room and !room.finished and room.dueling_players[pos] if room and !room.finished and room.dueling_players[pos]
room.finished = true
room.winner_name = room.dueling_players[pos].name_vpass room.winner_name = room.dueling_players[pos].name_vpass
#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
...@@ -3209,7 +3209,6 @@ ygopro.stoc_follow 'CHANGE_SIDE', false, (buffer, info, client, server, datas)-> ...@@ -3209,7 +3209,6 @@ ygopro.stoc_follow 'CHANGE_SIDE', false, (buffer, info, client, server, datas)->
room=ROOM_all[client.rid] room=ROOM_all[client.rid]
return unless room return unless room
room.changing_side = true room.changing_side = true
room.finished = false
client.selected_preduel = false client.selected_preduel = false
if settings.modules.side_timeout if settings.modules.side_timeout
client.side_tcount = settings.modules.side_timeout client.side_tcount = settings.modules.side_timeout
......
...@@ -1779,7 +1779,8 @@ ...@@ -1779,7 +1779,8 @@
if (index !== -1) { if (index !== -1) {
this.players.splice(index, 1); this.players.splice(index, 1);
} }
if (this.started && !this.finished && this.disconnector !== 'server' && client.pos < 4 && !client.system_kicked) { if (this.started && this.disconnector !== 'server' && client.pos < 4) {
this.finished = true;
if (!this.finished_by_death) { if (!this.finished_by_death) {
this.scores[client.name_vpass] = -9; this.scores[client.name_vpass] = -9;
if (this.random_type && !client.flee_free && (!settings.modules.reconnect.enabled || this.get_disconnected_count() === 0)) { if (this.random_type && !client.flee_free && (!settings.modules.reconnect.enabled || this.get_disconnected_count() === 0)) {
...@@ -2940,7 +2941,6 @@ ...@@ -2940,7 +2941,6 @@
delete room.long_resolve_chain; delete room.long_resolve_chain;
} }
if (room && !room.finished && room.dueling_players[pos]) { if (room && !room.finished && room.dueling_players[pos]) {
room.finished = true;
room.winner_name = room.dueling_players[pos].name_vpass; room.winner_name = room.dueling_players[pos].name_vpass;
room.scores[room.winner_name] = room.scores[room.winner_name] + 1; room.scores[room.winner_name] = room.scores[room.winner_name] + 1;
if (room.match_kill) { if (room.match_kill) {
...@@ -4114,7 +4114,6 @@ ...@@ -4114,7 +4114,6 @@
return; return;
} }
room.changing_side = true; room.changing_side = true;
room.finished = false;
client.selected_preduel = false; client.selected_preduel = false;
if (settings.modules.side_timeout) { if (settings.modules.side_timeout) {
client.side_tcount = settings.modules.side_timeout; client.side_tcount = settings.modules.side_timeout;
......
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