Commit e14fc961 authored by nanahira's avatar nanahira

Merge branch 'mc'

parents 286db368 7e12abf3
Pipeline #5642 failed with stages
in 6 minutes and 32 seconds
......@@ -2361,9 +2361,9 @@ ygopro.ctos_follow 'JOIN_GAME', true, (buffer, info, client, server, datas)->
auto_death: !!(opt0 & 0x1) ? 40 : false
}
#console.log(options)
if(options.rule == 2)
if options.rule == 2
options.lflist = -1
else
else if options.rule != 3
options.lflist = _.findIndex lflists, (list)-> ((options.rule == 1) == list.tcg) and list.date.isBefore()
room_title = info.pass.slice(8).replace(String.fromCharCode(0xFEFF), ' ')
if badwordR.level3.test(room_title)
......
......@@ -3117,7 +3117,7 @@
//console.log(options)
if (options.rule === 2) {
options.lflist = -1;
} else {
} else if (options.rule !== 3) {
options.lflist = _.findIndex(lflists, function(list) {
return ((options.rule === 1) === list.tcg) && list.date.isBefore();
});
......
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