Merge branch 'mc'

b2a9b8dc · nanahira · f9cedc72 · b2ff4353 · b2a9b8dc · b2a9b8dc
Commit b2a9b8dc authored Nov 17, 2020 by nanahira
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

ygopro-server.coffee ygopro-server.coffee +1 -1

ygopro-server.js ygopro-server.js +1 -1

No files found.
--- a/ygopro-server.coffee
+++ b/ygopro-server.coffee
@@ -419,7 +419,7 @@ init = () ->
        log.info("Chat color migrated.")
    catch
  try
-    cppversion = parseInt(await fs.promises.readFile('ygopro/gframe/game.cpp', 'utf8').match(/PRO_VERSION = ([x\dABCDEF]+)/)[1], '16')
+    cppversion = parseInt((await fs.promises.readFile('ygopro/gframe/game.cpp', 'utf8')).match(/PRO_VERSION = ([x\dABCDEF]+)/)[1], '16')
    await setting_change(settings, "version", cppversion)
    log.info "ygopro version 0x"+settings.version.toString(16), "(from source code)"
  catch

--- a/ygopro-server.js
+++ b/ygopro-server.js
@@ -551,7 +551,7 @@
      }
    }
    try {
-      cppversion = parseInt((await fs.promises.readFile('ygopro/gframe/game.cpp', 'utf8').match(/PRO_VERSION = ([x\dABCDEF]+)/)[1]), '16');
+      cppversion = parseInt(((await fs.promises.readFile('ygopro/gframe/game.cpp', 'utf8'))).match(/PRO_VERSION = ([x\dABCDEF]+)/)[1], '16');
      await setting_change(settings, "version", cppversion);
      log.info("ygopro version 0x" + settings.version.toString(16), "(from source code)");
    } catch (error1) {