Skip to content

Commit ef939d4

Browse files
committed
Fix #637 Exception ticking world causing server crash
1 parent d45c0f3 commit ef939d4

File tree

1 file changed

+17
-13
lines changed

1 file changed

+17
-13
lines changed

extratrees/src/main/java/binnie/extratrees/gen/BinnieWorldGenTree.java

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,27 @@
11
package binnie.extratrees.gen;
22

3-
import binnie.extratrees.worldgen.BlockType;
4-
import binnie.extratrees.worldgen.BlockTypeLeaf;
5-
import binnie.extratrees.worldgen.BlockTypeLog;
6-
import binnie.extratrees.worldgen.BlockTypeVoid;
7-
import binnie.extratrees.worldgen.WorldGenBlockType;
8-
import com.mojang.authlib.GameProfile;
9-
import forestry.api.world.ITreeGenData;
10-
import forestry.arboriculture.tiles.TileTreeContainer;
11-
import forestry.arboriculture.worldgen.WorldGenTree;
12-
import forestry.core.tiles.TileUtil;
3+
import javax.annotation.Nullable;
4+
import java.util.Random;
5+
136
import net.minecraft.init.Blocks;
147
import net.minecraft.util.EnumFacing;
158
import net.minecraft.util.math.BlockPos;
169
import net.minecraft.world.World;
10+
11+
import com.mojang.authlib.GameProfile;
12+
1713
import net.minecraftforge.event.terraingen.TerrainGen;
1814

19-
import javax.annotation.Nullable;
20-
import java.util.Random;
15+
import forestry.api.world.ITreeGenData;
16+
import forestry.arboriculture.tiles.TileTreeContainer;
17+
import forestry.arboriculture.worldgen.WorldGenTree;
18+
import forestry.core.tiles.TileUtil;
19+
20+
import binnie.extratrees.worldgen.BlockType;
21+
import binnie.extratrees.worldgen.BlockTypeLeaf;
22+
import binnie.extratrees.worldgen.BlockTypeLog;
23+
import binnie.extratrees.worldgen.BlockTypeVoid;
24+
import binnie.extratrees.worldgen.WorldGenBlockType;
2125

2226
public class BinnieWorldGenTree extends WorldGenTree {
2327
protected final ITreeGenData treeGen;
@@ -112,7 +116,7 @@ public final boolean generate(World world, Random random, BlockPos pos, boolean
112116
this.pos = genPos;
113117
this.preGenerate(world, random, this.pos);
114118

115-
if (!force && !this.canGrow()) {
119+
if (!force && !this.canGrow() || genPos == null) {
116120
return false;
117121
}
118122
generateTrunk();

0 commit comments

Comments
 (0)