Merge branch 'mc'

ygopro-server.coffee

@@ -462,10 +462,10 @@ release_disconnect = (dinfo, reconnected) ->
   return
 
 CLIENT_get_authorize_key = (client) ->
-  if settings.modules.mycard.enabled or client.is_local
+  if settings.modules.mycard.enabled or settings.modules.tournament_mode.enabled or client.is_local
     return client.name
   else
-    return client.ip
+    return client.ip + ":" + client.name
 
 CLIENT_reconnect_unregister = (client, reconnected, exact) ->
   if !settings.modules.reconnect.enabled

ygopro-server.js

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