Fix for #637 and Cubic Chunks compatibility crash. Update Forestry min version (#638)

nstearns96 · web-flow · commit d57e5033743e · 2020-03-29T00:07:44.000+01:00
* Updated to forestry 5.8.2.418 Fixed crash for Cubic Chunks * Fixed crash on sapling trying to grow in invalid position.(Fix: #637)
diff --git a/extrabees/src/main/java/binnie/extrabees/worldgen/WorldGenHiveMarble.java b/extrabees/src/main/java/binnie/extrabees/worldgen/WorldGenHiveMarble.java
@@ -27,7 +27,7 @@ public BlockPos getPosForHive(World world, int x, int z) {
 		//get to ground
 		BlockPos topPos = world.getHeight(new BlockPos(x, 0, z));
 		int worldHeight = topPos.getY();
-		if (topPos.getY() == 0) {
+		if (topPos.getY() <= 0) {
 			return null;
 		}
 
diff --git a/extrabees/src/main/java/binnie/extrabees/worldgen/WorldGenHiveRock.java b/extrabees/src/main/java/binnie/extrabees/worldgen/WorldGenHiveRock.java
@@ -32,7 +32,7 @@ public BlockPos getPosForHive(World world, int x, int z) {
 		//get to the ground
 		BlockPos topPos = world.getHeight(new BlockPos(x, 0, z));
 		int worldHeight = topPos.getY();
-		if (topPos.getY() == 0) {
+		if (topPos.getY() <= 0) {
 			return null;
 		}
 
diff --git a/extrabees/src/main/java/binnie/extrabees/worldgen/WorldGenHiveWater.java b/extrabees/src/main/java/binnie/extrabees/worldgen/WorldGenHiveWater.java
@@ -20,7 +20,7 @@ public BlockPos getPosForHive(World world, int x, int z) {
 		// get to the ground
 		final BlockPos topPos = world.getHeight(new BlockPos(x, 0, z));
 		int maxHeight = topPos.getY();
-		if (topPos.getY() == 0) {
+		if (topPos.getY() <= 0) {
 			return null;
 		}
 
diff --git a/extratrees/src/main/java/binnie/extratrees/gen/BinnieWorldGenTree.java b/extratrees/src/main/java/binnie/extratrees/gen/BinnieWorldGenTree.java
@@ -113,12 +113,14 @@ public final boolean generate(World world, Random random, BlockPos pos, boolean
 			genPos = getValidGrowthPos(world, pos);
 		}
 
+		if (genPos == null || (!force && !this.canGrow())) {
+			return false;
+		}
+
 		this.pos = genPos;
+
 		this.preGenerate(world, random, this.pos);
 
-		if (!force && !this.canGrow() || genPos == null) {
-			return false;
-		}
 		generateTrunk();
 		generateLeaves();
 		if(tree.allowsFruitBlocks()) {
diff --git a/gradle.properties b/gradle.properties
@@ -8,7 +8,7 @@ forgeversion=14.23.5.2847
 mcp_mappings=stable_39
 curse_project_id=223525
 
-forestry_version=5.8.2.370
+forestry_version=5.8.2.418
 forestry_mcversion=1.12.2
 ic2_version=2.8.187-ex112
 

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public BlockPos getPosForHive(World world, int x, int z) {`
`27`	`27`	`//get to ground`
`28`	`28`	`BlockPos topPos = world.getHeight(new BlockPos(x, 0, z));`
`29`	`29`	`int worldHeight = topPos.getY();`
`30`		`- if (topPos.getY() == 0) {`
	`30`	`+ if (topPos.getY() <= 0) {`
`31`	`31`	`return null;`
`32`	`32`	`}`
`33`	`33`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public BlockPos getPosForHive(World world, int x, int z) {`
`32`	`32`	`//get to the ground`
`33`	`33`	`BlockPos topPos = world.getHeight(new BlockPos(x, 0, z));`
`34`	`34`	`int worldHeight = topPos.getY();`
`35`		`- if (topPos.getY() == 0) {`
	`35`	`+ if (topPos.getY() <= 0) {`
`36`	`36`	`return null;`
`37`	`37`	`}`
`38`	`38`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public BlockPos getPosForHive(World world, int x, int z) {`
`20`	`20`	`// get to the ground`
`21`	`21`	`final BlockPos topPos = world.getHeight(new BlockPos(x, 0, z));`
`22`	`22`	`int maxHeight = topPos.getY();`
`23`		`- if (topPos.getY() == 0) {`
	`23`	`+ if (topPos.getY() <= 0) {`
`24`	`24`	`return null;`
`25`	`25`	`}`
`26`	`26`