Merge branch 'master' of git.mycard.moe:mycard/srvpro

ygopro-server.coffee

@@ -2389,8 +2389,8 @@ ygopro.ctos_follow 'JOIN_GAME', true, (buffer, info, client, server, datas)->
           #console.log(options)
           if options.rule == 2
             options.lflist = -1
-          else if options.rule != 3
-            options.lflist = _.findIndex lflists, (list)-> ((options.rule == 1) == list.tcg) and list.date.isBefore()
+          #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)
             log.warn("BAD ROOM NAME LEVEL 3", room_title, client.name, client.ip)

ygopro-server.js

@@ -3147,11 +3147,9 @@
             //console.log(options)
             if (options.rule === 2) {
               options.lflist = -1;
-            } else if (options.rule !== 3) {
-              options.lflist = _.findIndex(lflists, function(list) {
-                return ((options.rule === 1) === list.tcg) && list.date.isBefore();
-              });
             }
+            //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)) {
               log.warn("BAD ROOM NAME LEVEL 3", room_title, client.name, client.ip);