diff --git a/README b/README index 3d44af7..8636621 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ Minecraft Land Generator version 1.6.3 Updated June 1, 2012 -(BuildID: 1338534569000) +(BuildID: 1338534982000) 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 8e28102..b2e77a5 100644 --- a/bin/MLG-BuildID +++ b/bin/MLG-BuildID @@ -47,3 +47,4 @@ D47A4456BA15C9436AF78C5DAA737DA3=1338533153000# MLG v1.6.3 4C107AA2B0F161CD44B5F6ECE20DEFBC=1338533873000# MLG v1.6.3 4F0E327BD0FB366E4E2A188721D4B54C=1338534323000# MLG v1.6.3 A993CE06F1D26D3272A3BBE12488A323=1338534569000# MLG v1.6.3 +62ADC2F8E85433A9FC0BA1693BB2908E=1338534982000# MLG v1.6.3 diff --git a/bin/MinecraftLandGenerator.conf b/bin/MinecraftLandGenerator.conf index 1fcf638..0f11db6 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:09 AM Pacific Daylight Time +#Auto-Generated: Friday, June 1, 2012 at 12:16 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 3cca3b0..ded49ae 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 cf2efeb..f1e3c37 100644 --- a/src/corrodias/minecraft/landgenerator/Main.java +++ b/src/corrodias/minecraft/landgenerator/Main.java @@ -1617,29 +1617,29 @@ public class Main { while ((line = in.readLine()) != null) { int pos = line.indexOf('='); - //if (pos == -1) { // If we have no = sign - // pos = 0; - //} - 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) { // 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(); - // pos = -1; - //} - - if ((pos == -1) || (pos == 0)) { - property = ""; - value = ""; - } else { - property = line.substring(0, pos).toLowerCase(); - value = line.substring(pos + 1, end); + if (end <= pos) { // 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(); + pos = -1; } + if (end == 0) { //hash is first char, meaning entire line is a comment + pos = 0; + } + + //if ((pos == -1) || (pos == 0)) { + // property = ""; + // value = ""; + //} else { + // property = line.substring(0, pos).toLowerCase(); + // value = line.substring(pos + 1, end); + //} + errorMsg = line + " pos: " + pos + " end: " + end + " line.length(): " + line.length(); try { @@ -1650,6 +1650,9 @@ public class Main { } if (pos != -1) { + property = line.substring(0, pos).toLowerCase(); + value = line.substring(pos + 1, end); + if (property.equals("serverpath")) { serverPath = value; } else if (property.equals("java")) {