Revert "remove version workaround"

This reverts commit 0494609f.

ygopro-server.coffee

@@ -914,7 +914,7 @@ ygopro.ctos_follow 'JOIN_GAME', false, (buffer, info, client, server)->
     replay_id=Cloud_replay_ids[Math.floor(Math.random()*Cloud_replay_ids.length)]
     redisdb.hgetall "replay:"+replay_id, client.open_cloud_replay
 
-  else if info.version != settings.version # and (info.version < 9020 or settings.version != 4927) #强行兼容23333版
+  else if info.version != settings.version and (info.version < 9020 or settings.version != 4927) #强行兼容23333版
     ygopro.stoc_send_chat(client, settings.modules.update, ygopro.constants.COLORS.RED)
     ygopro.stoc_send client, 'ERROR_MSG', {
       msg: 4
@@ -931,12 +931,12 @@ ygopro.ctos_follow 'JOIN_GAME', false, (buffer, info, client, server)->
       ygopro.stoc_die(client, '${invalid_password_length}')
       return
 
-    #if info.version >= 9020 and settings.version == 4927 #强行兼容23333版
-    #  info.version = settings.version
-    #  struct = ygopro.structs["CTOS_JoinGame"]
-    #  struct._setBuff(buffer)
-    #  struct.set("version", info.version)
-    #  buffer = struct.buffer
+    if info.version >= 9020 and settings.version == 4927 #强行兼容23333版
+      info.version = settings.version
+      struct = ygopro.structs["CTOS_JoinGame"]
+      struct._setBuff(buffer)
+      struct.set("version", info.version)
+      buffer = struct.buffer
 
     buffer = new Buffer(info.pass[0...8], 'base64')
 
@@ -1109,13 +1109,13 @@ ygopro.ctos_follow 'JOIN_GAME', false, (buffer, info, client, server)->
     ygopro.stoc_die(client, "${invalid_password_room}")
   
   else
-    #if info.version >= 9020 and settings.version == 4927 #强行兼容23333版
-    #  info.version = settings.version
-    #  struct = ygopro.structs["CTOS_JoinGame"]
-    #  struct._setBuff(buffer)
-    #  struct.set("version", info.version)
-    #  buffer = struct.buffer
-    #  #ygopro.stoc_send_chat(client, "看起来你是YGOMobile的用户，请记得更新先行卡补丁，否则会看到白卡", ygopro.constants.COLORS.GREEN)
+    if info.version >= 9020 and settings.version == 4927 #强行兼容23333版
+      info.version = settings.version
+      struct = ygopro.structs["CTOS_JoinGame"]
+      struct._setBuff(buffer)
+      struct.set("version", info.version)
+      buffer = struct.buffer
+      #ygopro.stoc_send_chat(client, "看起来你是YGOMobile的用户，请记得更新先行卡补丁，否则会看到白卡", ygopro.constants.COLORS.GREEN)
       
     #log.info 'join_game',info.pass, client.name
     room = ROOM_find_or_create_by_name(info.pass, client.ip)

ygopro-server.js

@@ -1103,7 +1103,7 @@
   });
 
   ygopro.ctos_follow('JOIN_GAME', false, function(buffer, info, client, server) {
-    var check, decrypted_buffer, finish, i, id, j, k, len, len1, name, ref, ref1, replay_id, room, secret;
+    var check, decrypted_buffer, finish, i, id, j, k, len, len1, name, ref, ref1, replay_id, room, secret, struct;
     info.pass = info.pass.trim();
     if (settings.modules.stop) {
       ygopro.stoc_die(client, settings.modules.stop);
@@ -1150,7 +1150,7 @@
     } else if (info.pass.toUpperCase() === "W" && settings.modules.cloud_replay.enabled) {
       replay_id = Cloud_replay_ids[Math.floor(Math.random() * Cloud_replay_ids.length)];
       redisdb.hgetall("replay:" + replay_id, client.open_cloud_replay);
-    } else if (info.version !== settings.version) {
+    } else if (info.version !== settings.version && (info.version < 9020 || settings.version !== 4927)) {
       ygopro.stoc_send_chat(client, settings.modules.update, ygopro.constants.COLORS.RED);
       ygopro.stoc_send(client, 'ERROR_MSG', {
         msg: 4,
@@ -1165,6 +1165,13 @@
         ygopro.stoc_die(client, '${invalid_password_length}');
         return;
       }
+      if (info.version >= 9020 && settings.version === 4927) {
+        info.version = settings.version;
+        struct = ygopro.structs["CTOS_JoinGame"];
+        struct._setBuff(buffer);
+        struct.set("version", info.version);
+        buffer = struct.buffer;
+      }
       buffer = new Buffer(info.pass.slice(0, 8), 'base64');
       if (buffer.length !== 6) {
         ygopro.stoc_die(client, '${invalid_password_payload}');
@@ -1348,6 +1355,13 @@
     } else if (info.pass.length && !ROOM_validate(info.pass)) {
       ygopro.stoc_die(client, "${invalid_password_room}");
     } else {
+      if (info.version >= 9020 && settings.version === 4927) {
+        info.version = settings.version;
+        struct = ygopro.structs["CTOS_JoinGame"];
+        struct._setBuff(buffer);
+        struct.set("version", info.version);
+        buffer = struct.buffer;
+      }
       room = ROOM_find_or_create_by_name(info.pass, client.ip);
       if (!room) {
         ygopro.stoc_die(client, "${server_full}");