Merge branch 'mc'

ygopro-server.coffee

@@ -576,10 +576,10 @@ release_disconnect = (dinfo, reconnected) ->
   return
 
 CLIENT_get_authorize_key = (client) ->
-  if settings.modules.mycard.enabled or settings.modules.tournament_mode.enabled or settings.modules.challonge.enabled or client.is_local
+  if !settings.modules.mycard.enabled and client.vpass
+    return client.name + "$" + client.vpass
+  else if settings.modules.mycard.enabled or settings.modules.tournament_mode.enabled or settings.modules.challonge.enabled or client.is_local
     return client.name
-  else if !settings.modules.mycard.enabled and client.vpass
-    return client.vpass + "$" + client.name
   else
     return client.ip + ":" + client.name
 

ygopro-server.js

@@ -756,10 +756,10 @@
   };
 
   CLIENT_get_authorize_key = function(client) {
-    if (settings.modules.mycard.enabled || settings.modules.tournament_mode.enabled || settings.modules.challonge.enabled || client.is_local) {
+    if (!settings.modules.mycard.enabled && client.vpass) {
+      return client.name + "$" + client.vpass;
+    } else if (settings.modules.mycard.enabled || settings.modules.tournament_mode.enabled || settings.modules.challonge.enabled || client.is_local) {
       return client.name;
-    } else if (!settings.modules.mycard.enabled && client.vpass) {
-      return client.vpass + "$" + client.name;
     } else {
       return client.ip + ":" + client.name;
     }