Merge branch 'master' into ai-play

ygopro-server.coffee

@@ -2393,7 +2393,7 @@ ygopro.ctos_follow 'JOIN_GAME', true, (buffer, info, client, server, datas)->
             auto_death: !!(opt0 & 0x1) ? 40 : false
           }
           #console.log(options)
-          if(options.rule == 3)
+          if(options.rule == 2)
             options.lflist = -1
           else
             options.lflist = _.findIndex lflists, (list)-> ((options.rule == 1) == list.tcg) and list.date.isBefore()

ygopro-server.js

@@ -3147,7 +3147,7 @@
               }
             };
             //console.log(options)
-            if (options.rule === 3) {
+            if (options.rule === 2) {
               options.lflist = -1;
             } else {
               options.lflist = _.findIndex(lflists, function(list) {