Skip to content

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

Merge branch 'mc'

parents 404f8039 4727df69
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 2 deletions
ygopro-server.coffee
View file @ 7d8e4805
...@@ -1533,7 +1533,7 @@ ygopro.ctos_follow 'JOIN_GAME', false, (buffer, info, client, server)-> ...@@ -1533,7 +1533,7 @@ ygopro.ctos_follow 'JOIN_GAME', false, (buffer, info, client, server)->
room = ROOM_find_or_create_by_name('M#' + found.id) room = ROOM_find_or_create_by_name('M#' + found.id)
if room if room
room.challonge_info = found room.challonge_info = found
room.max_player = 2 # room.max_player = 2
room.welcome = "${challonge_match_created}" room.welcome = "${challonge_match_created}"
if !room if !room
ygopro.stoc_die(client, "${server_full}") ygopro.stoc_die(client, "${server_full}")
......
ygopro-server.js
View file @ 7d8e4805
...@@ -1876,7 +1876,6 @@ ...@@ -1876,7 +1876,6 @@
room = ROOM_find_or_create_by_name('M#' + found.id); room = ROOM_find_or_create_by_name('M#' + found.id);
if (room) { if (room) {
room.challonge_info = found; room.challonge_info = found;
room.max_player = 2;
room.welcome = "${challonge_match_created}"; room.welcome = "${challonge_match_created}";
} }
if (!room) { if (!room) {
......
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