diff --git a/README b/README index 7b8fb2a..09db93c 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ Minecraft Land Generator version 1.6.3 Updated June 1, 2012 -(BuildID: 1338535367000) +(BuildID: 1338535650000) Original Code by Corrodias November 2010 Enhanced Code by Morlok8k Feb. 2011 to Now (or at least to June 1, 2012!) diff --git a/bin/MLG-BuildID b/bin/MLG-BuildID index e3dd805..821cb18 100644 --- a/bin/MLG-BuildID +++ b/bin/MLG-BuildID @@ -50,3 +50,4 @@ A993CE06F1D26D3272A3BBE12488A323=1338534569000# MLG v1.6.3 62ADC2F8E85433A9FC0BA1693BB2908E=1338534982000# MLG v1.6.3 5C39B24E286CB21FD69D5A1979CA7AAF=1338535155000# MLG v1.6.3 F96F4F3862138D498B203C2848086289=1338535367000# MLG v1.6.3 +6A48691EACB4E484DFFBAC8B699B0604=1338535650000# MLG v1.6.3 diff --git a/bin/MinecraftLandGenerator.conf b/bin/MinecraftLandGenerator.conf index fdb90cd..42276f4 100644 --- a/bin/MinecraftLandGenerator.conf +++ b/bin/MinecraftLandGenerator.conf @@ -1,6 +1,6 @@ #Minecraft Land Generator Configuration File: Version: 1.6.3 #Authors: Corrodias, Morlok8k, pr0f1x -#Auto-Generated: Friday, June 1, 2012 at 12:22 AM Pacific Daylight Time +#Auto-Generated: Friday, June 1, 2012 at 12:27 AM Pacific Daylight Time #Line to run server: Java=java -Djava.awt.headless=true -Djline.terminal=jline.UnsupportedTerminal -Duser.language=en -Xms1024m -Xmx1024m -Xincgc -jar minecraft_server.jar nogui diff --git a/bin/MinecraftLandGenerator.jar b/bin/MinecraftLandGenerator.jar index 64c2a63..842f112 100755 Binary files a/bin/MinecraftLandGenerator.jar and b/bin/MinecraftLandGenerator.jar differ diff --git a/src/corrodias/minecraft/landgenerator/Main.java b/src/corrodias/minecraft/landgenerator/Main.java index 7b994f3..b1d3aaf 100644 --- a/src/corrodias/minecraft/landgenerator/Main.java +++ b/src/corrodias/minecraft/landgenerator/Main.java @@ -1605,7 +1605,7 @@ public class Main { private void readConf() { //TODO: element comment - String errorMsg = ""; + //String errorMsg = ""; try { File config = new File(MinecraftLandGeneratorConf); @@ -1618,10 +1618,10 @@ public class Main { int pos = line.indexOf('='); int end = line.lastIndexOf('#'); // comments, ignored lines - out(" end: " + end); + if (end == -1) { // If we have no hash sign, then we read till the end of the line end = line.length(); - out(" end: " + end); + } if (end <= (pos + 1)) { // If hash is before the '=', we may have an issue... it should be fine, cause we check for issues next, but lets make sure. end = line.length(); @@ -1633,15 +1633,7 @@ public class Main { pos = 0; } - //if ((pos == -1) || (pos == 0)) { - // property = ""; - // value = ""; - //} else { - // property = line.substring(0, pos).toLowerCase(); - // value = line.substring(pos + 1, end); - //} - - errorMsg = + /*errorMsg = line + " pos: " + pos + " end: " + end + " line.length(): " + line.length(); try { property = line.substring(0, pos).toLowerCase(); @@ -1649,10 +1641,15 @@ public class Main { } catch (Exception e) { err(errorMsg); } - + */ if (pos != -1) { - property = line.substring(0, pos).toLowerCase(); - value = line.substring(pos + 1, end); + if (line.length() == 0) { + property = ""; + value = ""; + } else { + property = line.substring(0, pos).toLowerCase(); + value = line.substring(pos + 1, end); + } if (property.equals("serverpath")) { serverPath = value;