diff --git a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/config.cfg b/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/config.cfg index 51f09b3c..4eb24654 100644 --- a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/config.cfg +++ b/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/config.cfg @@ -45,7 +45,7 @@ textureProviderConfig: { # Jar signing buildExtendedOperation: { enabled: false; - script: "java -jar myTransformer.jar %launcher-obf% %launcher-output% %launcher-nonObf%"; // The script to run + script: "java -jar myTransformer.jar %launcher-obf% %launcher-output% %launcher-nonObf%"; }; # Binaries name diff --git a/Launcher/runtime/engine/api.js b/Launcher/runtime/engine/api.js index 785f8f96..fb4ded98 100644 --- a/Launcher/runtime/engine/api.js +++ b/Launcher/runtime/engine/api.js @@ -101,7 +101,7 @@ function newTask(r) { } function newRequestTask(request) { - FunctionalBridge.makeRequest(request); + return newTask(function() request.request()); } function startTask(task) { diff --git a/Launcher/src/main/java/ru/gravit/launcher/hwid/OshiHWIDProvider.java b/Launcher/src/main/java/ru/gravit/launcher/hwid/OshiHWIDProvider.java index 24374f1b..626648ee 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/hwid/OshiHWIDProvider.java +++ b/Launcher/src/main/java/ru/gravit/launcher/hwid/OshiHWIDProvider.java @@ -40,6 +40,9 @@ public HWID getHWID() { hwid.serialNumber = getSerial(); hwid.totalMemory = getTotalMemory(); hwid.HWDiskSerial = getHWDisk(); + LogHelper.debug("serialNumber %s",hwid.serialNumber); + LogHelper.debug("totalMemory %d",hwid.totalMemory); + LogHelper.debug("HWDiskSerial %s",hwid.HWDiskSerial); return hwid; } }