merge

ygopro-server.coffee

@@ -576,10 +576,10 @@ release_disconnect = (dinfo, reconnected) ->
   return
 
 CLIENT_get_authorize_key = (client) ->
-  if settings.modules.vip.enabled and client.vip
-    return client.name + "$" + client.vpass
   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
 
@@ -686,7 +686,7 @@ CLIENT_is_able_to_reconnect = (client, deckbuf) ->
 
 CLIENT_get_kick_reconnect_target = (client, deckbuf) ->
   for room in ROOM_all when room and room.started and !room.windbot
-    for player in room.get_playing_player() when !player.closed and player.name == client.name and player.pass == client.pass and (settings.modules.mycard.enabled or settings.modules.tournament_mode.enabled or player.ip == client.ip or (settings.modules.vip.enabled and player.vip and client.vpass == player.vpass)) and (!deckbuf or _.isEqual(player.start_deckbuf, deckbuf))
+    for player in room.get_playing_player() when !player.closed and player.name == client.name and player.pass == client.pass and (settings.modules.mycard.enabled or settings.modules.tournament_mode.enabled or player.ip == client.ip or (client.vpass and client.vpass == player.vpass)) and (!deckbuf or _.isEqual(player.start_deckbuf, deckbuf))
       return player
   return null
 

ygopro-server.js

@@ -756,11 +756,10 @@
   };
 
   CLIENT_get_authorize_key = function(client) {
-    if (settings.modules.vip.enabled && client.vip) {
-      return client.name + "$" + client.vpass;
-    }
     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;
     }
@@ -915,7 +914,7 @@
         ref3 = room.get_playing_player();
         for (n = 0, len3 = ref3.length; n < len3; n++) {
           player = ref3[n];
-          if (!player.closed && player.name === client.name && player.pass === client.pass && (settings.modules.mycard.enabled || settings.modules.tournament_mode.enabled || player.ip === client.ip || (settings.modules.vip.enabled && player.vip && client.vpass === player.vpass)) && (!deckbuf || _.isEqual(player.start_deckbuf, deckbuf))) {
+          if (!player.closed && player.name === client.name && player.pass === client.pass && (settings.modules.mycard.enabled || settings.modules.tournament_mode.enabled || player.ip === client.ip || (client.vpass && client.vpass === player.vpass)) && (!deckbuf || _.isEqual(player.start_deckbuf, deckbuf))) {
             return player;
           }
         }