From fb04a1aa5031349e5393d5e021faa99be2f368a1 Mon Sep 17 00:00:00 2001 From: CraftBukkit/Spigot Date: Wed, 12 Aug 2020 08:54:53 +1000 Subject: [PATCH] Fix crash growing saplings By: md_5 --- .../nms-patches/WorldGenTreeProvider.patch | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/paper-server/nms-patches/WorldGenTreeProvider.patch b/paper-server/nms-patches/WorldGenTreeProvider.patch index 307357cbf6..7d445a038a 100644 --- a/paper-server/nms-patches/WorldGenTreeProvider.patch +++ b/paper-server/nms-patches/WorldGenTreeProvider.patch @@ -23,39 +23,39 @@ + + // CraftBukkit start + protected void setTreeType(WorldGenFeatureConfigured worldgentreeabstract) { -+ if (worldgentreeabstract.f == BiomeDecoratorGroups.OAK || worldgentreeabstract.f == BiomeDecoratorGroups.OAK_BEES_005) { ++ if (worldgentreeabstract == BiomeDecoratorGroups.OAK || worldgentreeabstract == BiomeDecoratorGroups.OAK_BEES_005) { + BlockSapling.treeType = TreeType.TREE; -+ } else if (worldgentreeabstract.f == BiomeDecoratorGroups.HUGE_RED_MUSHROOM) { ++ } else if (worldgentreeabstract == BiomeDecoratorGroups.HUGE_RED_MUSHROOM) { + BlockSapling.treeType = TreeType.RED_MUSHROOM; -+ } else if (worldgentreeabstract.f == BiomeDecoratorGroups.HUGE_BROWN_MUSHROOM) { ++ } else if (worldgentreeabstract == BiomeDecoratorGroups.HUGE_BROWN_MUSHROOM) { + BlockSapling.treeType = TreeType.BROWN_MUSHROOM; -+ } else if (worldgentreeabstract.f == BiomeDecoratorGroups.JUNGLE_TREE) { ++ } else if (worldgentreeabstract == BiomeDecoratorGroups.JUNGLE_TREE) { + BlockSapling.treeType = TreeType.COCOA_TREE; -+ } else if (worldgentreeabstract.f == BiomeDecoratorGroups.JUNGLE_TREE_NO_VINE) { ++ } else if (worldgentreeabstract == BiomeDecoratorGroups.JUNGLE_TREE_NO_VINE) { + BlockSapling.treeType = TreeType.SMALL_JUNGLE; -+ } else if (worldgentreeabstract.f == BiomeDecoratorGroups.PINE) { ++ } else if (worldgentreeabstract == BiomeDecoratorGroups.PINE) { + BlockSapling.treeType = TreeType.TALL_REDWOOD; -+ } else if (worldgentreeabstract.f == BiomeDecoratorGroups.SPRUCE) { ++ } else if (worldgentreeabstract == BiomeDecoratorGroups.SPRUCE) { + BlockSapling.treeType = TreeType.REDWOOD; -+ } else if (worldgentreeabstract.f == BiomeDecoratorGroups.ACACIA) { ++ } else if (worldgentreeabstract == BiomeDecoratorGroups.ACACIA) { + BlockSapling.treeType = TreeType.ACACIA; -+ } else if (worldgentreeabstract.f == BiomeDecoratorGroups.BIRCH || worldgentreeabstract.f == BiomeDecoratorGroups.BIRCH_BEES_005) { ++ } else if (worldgentreeabstract == BiomeDecoratorGroups.BIRCH || worldgentreeabstract == BiomeDecoratorGroups.BIRCH_BEES_005) { + BlockSapling.treeType = TreeType.BIRCH; -+ } else if (worldgentreeabstract.f == BiomeDecoratorGroups.SUPER_BIRCH_BEES_0002) { ++ } else if (worldgentreeabstract == BiomeDecoratorGroups.SUPER_BIRCH_BEES_0002) { + BlockSapling.treeType = TreeType.TALL_BIRCH; -+ } else if (worldgentreeabstract.f == BiomeDecoratorGroups.SWAMP_TREE) { ++ } else if (worldgentreeabstract == BiomeDecoratorGroups.SWAMP_TREE) { + BlockSapling.treeType = TreeType.SWAMP; -+ } else if (worldgentreeabstract.f == BiomeDecoratorGroups.FANCY_OAK || worldgentreeabstract.f == BiomeDecoratorGroups.FANCY_OAK_BEES_005) { ++ } else if (worldgentreeabstract == BiomeDecoratorGroups.FANCY_OAK || worldgentreeabstract == BiomeDecoratorGroups.FANCY_OAK_BEES_005) { + BlockSapling.treeType = TreeType.BIG_TREE; -+ } else if (worldgentreeabstract.f == BiomeDecoratorGroups.JUNGLE_BUSH) { ++ } else if (worldgentreeabstract == BiomeDecoratorGroups.JUNGLE_BUSH) { + BlockSapling.treeType = TreeType.JUNGLE_BUSH; -+ } else if (worldgentreeabstract.f == BiomeDecoratorGroups.DARK_OAK) { ++ } else if (worldgentreeabstract == BiomeDecoratorGroups.DARK_OAK) { + BlockSapling.treeType = TreeType.DARK_OAK; -+ } else if (worldgentreeabstract.f == BiomeDecoratorGroups.MEGA_SPRUCE) { ++ } else if (worldgentreeabstract == BiomeDecoratorGroups.MEGA_SPRUCE) { + BlockSapling.treeType = TreeType.MEGA_REDWOOD; -+ } else if (worldgentreeabstract.f == BiomeDecoratorGroups.MEGA_PINE) { ++ } else if (worldgentreeabstract == BiomeDecoratorGroups.MEGA_PINE) { + BlockSapling.treeType = TreeType.MEGA_REDWOOD; -+ } else if (worldgentreeabstract.f == BiomeDecoratorGroups.MEGA_JUNGLE_TREE) { ++ } else if (worldgentreeabstract == BiomeDecoratorGroups.MEGA_JUNGLE_TREE) { + BlockSapling.treeType = TreeType.JUNGLE; + } else { + throw new IllegalArgumentException("Unknown tree generator " + worldgentreeabstract);