Infinite seed fix

mr-short · Oct 31, 2015 · 4f78c96 · 4f78c96
1 parent d4e62c8
commit 4f78c96
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/net/buddat/wgenerator/TileMap.java b/src/net/buddat/wgenerator/TileMap.java
@@ -9,6 +9,8 @@
 
 import com.wurmonline.mesh.Tiles.Tile;
 
+import net.buddat.wgenerator.util.Constants;
+
 public class TileMap {
 
 	private Random biomeRandom;
@@ -216,7 +218,7 @@ public void plantBiome(int seedCount, int growthIterations, int density, int[] g
 		long totalSize;
 		int totalSeeds = 0;
 
-		while (totalSeeds < seedCount) {
+		for (long killCount = 0; totalSeeds < seedCount; killCount++) {
 			nextList.clear();
 			progress.setValue((int)((float)totalSeeds/seedCount*100f));
 
@@ -239,6 +241,10 @@ public void plantBiome(int seedCount, int growthIterations, int density, int[] g
 			if (totalSize != 1) {
 				totalSeeds++;
 			}
+			// Prevent infinite looping
+			if (killCount > seedCount*Constants.BIOME_SEED_LIMIT_MULTIPLIER) {
+				break;
+			}
 		}
 
 		log("Biome Seeding (" + type.tilename + ") completed in " + (System.currentTimeMillis() - startTime) + "ms.");

diff --git a/src/net/buddat/wgenerator/util/Constants.java b/src/net/buddat/wgenerator/util/Constants.java
@@ -54,5 +54,6 @@ public class Constants {
 	public static final boolean MORE_LAND = true;
 
 	public static final int GRID_SIZE = 8;
+	public static final int BIOME_SEED_LIMIT_MULTIPLIER = 10000;
 
 }