Skip to content

S
srvpro
Commit ebe86efb authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'mc'

parents e315c8f3 ef0668ae
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 4 deletions
ygopro-server.coffee
View file @ ebe86efb
...@@ -621,7 +621,7 @@ ROOM_unwelcome = (room, bad_player, reason)-> ...@@ -621,7 +621,7 @@ ROOM_unwelcome = (room, bad_player, reason)->
CLIENT_kick = (client) -> CLIENT_kick = (client) ->
client.system_kicked = true client.system_kicked = true
if settings.modules.reconnect.enabled and client.closed if settings.modules.reconnect.enabled and client.closed
CLIENT_reconnect_unregister(client, false, true) client.server.destroy()
else else
client.destroy() client.destroy()
return return
...@@ -3190,7 +3190,7 @@ ygopro.stoc_follow 'CHANGE_SIDE', false, (buffer, info, client, server)-> ...@@ -3190,7 +3190,7 @@ ygopro.stoc_follow 'CHANGE_SIDE', false, (buffer, info, client, server)->
if client.side_tcount == 1 if client.side_tcount == 1
ygopro.stoc_send_chat_to_room(room, client.name + "${side_overtime_room}", ygopro.constants.COLORS.BABYBLUE) ygopro.stoc_send_chat_to_room(room, client.name + "${side_overtime_room}", ygopro.constants.COLORS.BABYBLUE)
ygopro.stoc_send_chat(client, "${side_overtime}", ygopro.constants.COLORS.RED) ygopro.stoc_send_chat(client, "${side_overtime}", ygopro.constants.COLORS.RED)
room.scores[client.name] = -9 #room.scores[client.name] = -9
CLIENT_kick(client) CLIENT_kick(client)
clearInterval sinterval clearInterval sinterval
else else
......
ygopro-server.js
View file @ ebe86efb
...@@ -795,7 +795,7 @@ ...@@ -795,7 +795,7 @@
CLIENT_kick = function(client) { CLIENT_kick = function(client) {
client.system_kicked = true; client.system_kicked = true;
if (settings.modules.reconnect.enabled && client.closed) { if (settings.modules.reconnect.enabled && client.closed) {
CLIENT_reconnect_unregister(client, false, true); client.server.destroy();
} else { } else {
client.destroy(); client.destroy();
} }
...@@ -4071,7 +4071,6 @@ ...@@ -4071,7 +4071,6 @@
if (client.side_tcount === 1) { if (client.side_tcount === 1) {
ygopro.stoc_send_chat_to_room(room, client.name + "${side_overtime_room}", ygopro.constants.COLORS.BABYBLUE); ygopro.stoc_send_chat_to_room(room, client.name + "${side_overtime_room}", ygopro.constants.COLORS.BABYBLUE);
ygopro.stoc_send_chat(client, "${side_overtime}", ygopro.constants.COLORS.RED); ygopro.stoc_send_chat(client, "${side_overtime}", ygopro.constants.COLORS.RED);
room.scores[client.name] = -9;
CLIENT_kick(client); CLIENT_kick(client);
return clearInterval(sinterval); return clearInterval(sinterval);
} else { } else {
......
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