From 39cbfb0e331161ec5fd0b7c4ff11b767a5d953e3 Mon Sep 17 00:00:00 2001
From: zaxar163 <zahar.vcherachny@yandex.ru>
Date: Fri, 15 Mar 2019 20:04:26 +0300
Subject: [PATCH] =?UTF-8?q?[FIX]=20=D0=A0=D0=B0=D0=B1=D0=BE=D1=87=D0=B8?=
 =?UTF-8?q?=D0=B9=20=D1=80=D0=B0=D0=B4=D0=BE=D0=BD.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 LaunchServer/build.gradle                                      | 3 ++-
 .../java/ru/gravit/launchserver/binary/JARLauncherBinary.java  | 2 +-
 .../main/resources/ru/gravit/launchserver/defaults/radon.cfg   | 2 +-
 Radon                                                          | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/LaunchServer/build.gradle b/LaunchServer/build.gradle
index 0d419c1a..48d79a43 100644
--- a/LaunchServer/build.gradle
+++ b/LaunchServer/build.gradle
@@ -72,6 +72,7 @@ bundle project(':Radon')
 	}	
 
 	compileOnlyA 'com.google.guava:guava:26.0-jre'
+	compileOnlyA 'org.apache.logging.log4j:log4j-core:2.11.2'
 }
 
 task hikari(type: Copy) {
@@ -106,7 +107,7 @@ task launch4jA(type: Copy) {
 		} else {
 			fcp.exclude()
 		}
-	}
+	}	
 }
 
 task dumpLibs(type: Copy) {
diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/binary/JARLauncherBinary.java b/LaunchServer/src/main/java/ru/gravit/launchserver/binary/JARLauncherBinary.java
index 25205ea0..b5c79351 100644
--- a/LaunchServer/src/main/java/ru/gravit/launchserver/binary/JARLauncherBinary.java
+++ b/LaunchServer/src/main/java/ru/gravit/launchserver/binary/JARLauncherBinary.java
@@ -44,9 +44,9 @@ public void init() {
         tasks.add(new PrepareBuildTask(server));
         tasks.add(new MainBuildTask(server));
         tasks.add(new ProGuardBuildTask(server));
+        tasks.add(new AdditionalFixesApplyTask(server));
         tasks.add(new RadonBuildTask(server));
         tasks.add(new AttachJarsTask(server));
-        tasks.add(new AdditionalFixesApplyTask(server));
     }
 
     @Override
diff --git a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/radon.cfg b/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/radon.cfg
index 58af0e3b..ba6db149 100644
--- a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/radon.cfg
+++ b/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/radon.cfg
@@ -2,7 +2,7 @@ StringEncryption:
     Enabled: true
     Mode: Heavy
     StringPool: false
-InvokeDynamic: Heavy
+InvokeDynamic: Normal
 NumberObfuscation: Heavy
 FlowObfuscation: Heavy
 HideCode: true
diff --git a/Radon b/Radon
index 9ad5210d..b48dd653 160000
--- a/Radon
+++ b/Radon
@@ -1 +1 @@
-Subproject commit 9ad5210d821a5fcc072dae9f8e24ef37c8544757
+Subproject commit b48dd653f2930da7575cffe5fdd2516c9fea4353