diff --git a/.idea/misc.xml b/.idea/misc.xml index cfbf117..aa4b726 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -15,7 +15,7 @@ - + diff --git a/LaunchServer/resources/launchserver/defaults/profile1.12.1.cfg b/LaunchServer/resources/launchserver/defaults/profile1.12.1.cfg new file mode 100644 index 0000000..af7aa50 --- /dev/null +++ b/LaunchServer/resources/launchserver/defaults/profile1.12.1.cfg @@ -0,0 +1,44 @@ +version: "1.12"; +assetIndex: "1.12"; # 1.7.10+ only + +# Runtime-dependent params +dir: "XXXXX"; +assetDir: "asset1.12"; + +# Client params +sortIndex: 0; +title: "XXXXX"; +serverAddress: "server.tld"; +serverPort: 25565; + +# Updater and client watch service +updateFastCheck: true; +update: [ + "servers\\.dat" +]; +updateVerify: [ + "libraries", "natives", "mods", + "minecraft\\.jar", "forge\\.jar", "liteloader\\.jar" +]; +updateExclusions: []; + +# Client launcher params +mainClass: "net.minecraft.launchwrapper.Launch"; +classPath: [ "forge.jar", "liteloader.jar", "minecraft.jar", "libraries" ]; +jvmArgs: [ + "-Dfml.ignorePatchDiscrepancies=true", + "-Dfml.ignoreInvalidMinecraftCertificates=true", + + # Some options from Mojang's launcher + "-XX:+UseConcMarkSweepGC", + "-XX:+CMSIncrementalMode", + "-XX:-UseAdaptiveSizePolicy", + "-Xmn128M", + + # JVM Attach protection + "-XX:+DisableAttachMechanism" +]; +clientArgs: [ + "--tweakClass", "net.minecraftforge.fml.common.launcher.FMLTweaker", + "--tweakClass", "com.mumfrey.liteloader.launch.LiteLoaderTweaker" +]; diff --git a/LaunchServer/resources/launchserver/defaults/profile1.12.cfg b/LaunchServer/resources/launchserver/defaults/profile1.12.cfg deleted file mode 100644 index af7aa50..0000000 --- a/LaunchServer/resources/launchserver/defaults/profile1.12.cfg +++ /dev/null @@ -1,44 +0,0 @@ -version: "1.12"; -assetIndex: "1.12"; # 1.7.10+ only - -# Runtime-dependent params -dir: "XXXXX"; -assetDir: "asset1.12"; - -# Client params -sortIndex: 0; -title: "XXXXX"; -serverAddress: "server.tld"; -serverPort: 25565; - -# Updater and client watch service -updateFastCheck: true; -update: [ - "servers\\.dat" -]; -updateVerify: [ - "libraries", "natives", "mods", - "minecraft\\.jar", "forge\\.jar", "liteloader\\.jar" -]; -updateExclusions: []; - -# Client launcher params -mainClass: "net.minecraft.launchwrapper.Launch"; -classPath: [ "forge.jar", "liteloader.jar", "minecraft.jar", "libraries" ]; -jvmArgs: [ - "-Dfml.ignorePatchDiscrepancies=true", - "-Dfml.ignoreInvalidMinecraftCertificates=true", - - # Some options from Mojang's launcher - "-XX:+UseConcMarkSweepGC", - "-XX:+CMSIncrementalMode", - "-XX:-UseAdaptiveSizePolicy", - "-Xmn128M", - - # JVM Attach protection - "-XX:+DisableAttachMechanism" -]; -clientArgs: [ - "--tweakClass", "net.minecraftforge.fml.common.launcher.FMLTweaker", - "--tweakClass", "com.mumfrey.liteloader.launch.LiteLoaderTweaker" -]; diff --git a/LaunchServer/source/auth/provider/FileAuthProvider.java b/LaunchServer/source/auth/provider/FileAuthProvider.java index 0489d90..5e0e135 100644 --- a/LaunchServer/source/auth/provider/FileAuthProvider.java +++ b/LaunchServer/source/auth/provider/FileAuthProvider.java @@ -49,7 +49,7 @@ // Verify digest and return true username verifyDigest(entry == null ? null : entry.password, password); - if (entry == null || ip != null && !entry.ip.equals(ip)) { + if (entry == null || entry.ip != null && !entry.ip.equals(ip)) { authError("Authentication from this IP is not allowed"); } return entry.username;