SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.16.2

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2020-08-12 07:00:00 +10:00
parent 5e5f7f19dc
commit 6a9e00d4b6
208 changed files with 2144 additions and 2455 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
paper-server/nms-patches/WorldGenTreeProvider.patch
View File

@@ -14,8 +14,8 @@
} else {
+ setTreeType(worldgenfeatureconfigured); // CraftBukkit
worldserver.setTypeAndData(blockposition, Blocks.AIR.getBlockData(), 4);
((WorldGenFeatureTreeConfiguration) worldgenfeatureconfigured.e).a();
if (worldgenfeatureconfigured.a(worldserver, worldserver.getStructureManager(), chunkgenerator, random, blockposition)) {
((WorldGenFeatureTreeConfiguration) worldgenfeatureconfigured.f).b();
if (worldgenfeatureconfigured.a(worldserver, chunkgenerator, random, blockposition)) {
@@ -43,4 +45,46 @@
return true;
@@ -23,39 +23,39 @@
+
+ // CraftBukkit start
+ protected void setTreeType(WorldGenFeatureConfigured<?, ?> worldgentreeabstract) {
+ if (worldgentreeabstract.e == BiomeDecoratorGroups.NORMAL_TREE || worldgentreeabstract.e == BiomeDecoratorGroups.NORMAL_TREE_BEES_005) {
+ if (worldgentreeabstract.f == BiomeDecoratorGroups.OAK || worldgentreeabstract.f == BiomeDecoratorGroups.OAK_BEES_005) {
+ BlockSapling.treeType = TreeType.TREE;
+ } else if (worldgentreeabstract.e == BiomeDecoratorGroups.HUGE_RED_MUSHROOM) {
+ } else if (worldgentreeabstract.f == BiomeDecoratorGroups.HUGE_RED_MUSHROOM) {
+ BlockSapling.treeType = TreeType.RED_MUSHROOM;
+ } else if (worldgentreeabstract.e == BiomeDecoratorGroups.HUGE_BROWN_MUSHROOM) {
+ } else if (worldgentreeabstract.f == BiomeDecoratorGroups.HUGE_BROWN_MUSHROOM) {
+ BlockSapling.treeType = TreeType.BROWN_MUSHROOM;
+ } else if (worldgentreeabstract.e == BiomeDecoratorGroups.JUNGLE_TREE) {
+ } else if (worldgentreeabstract.f == BiomeDecoratorGroups.JUNGLE_TREE) {
+ BlockSapling.treeType = TreeType.COCOA_TREE;
+ } else if (worldgentreeabstract.e == BiomeDecoratorGroups.JUNGLE_TREE_NOVINE) {
+ } else if (worldgentreeabstract.f == BiomeDecoratorGroups.JUNGLE_TREE_NO_VINE) {
+ BlockSapling.treeType = TreeType.SMALL_JUNGLE;
+ } else if (worldgentreeabstract.e == BiomeDecoratorGroups.PINE_TREE) {
+ } else if (worldgentreeabstract.f == BiomeDecoratorGroups.PINE) {
+ BlockSapling.treeType = TreeType.TALL_REDWOOD;
+ } else if (worldgentreeabstract.e == BiomeDecoratorGroups.SPRUCE_TREE) {
+ } else if (worldgentreeabstract.f == BiomeDecoratorGroups.SPRUCE) {
+ BlockSapling.treeType = TreeType.REDWOOD;
+ } else if (worldgentreeabstract.e == BiomeDecoratorGroups.ACACIA_TREE) {
+ } else if (worldgentreeabstract.f == BiomeDecoratorGroups.ACACIA) {
+ BlockSapling.treeType = TreeType.ACACIA;
+ } else if (worldgentreeabstract.e == BiomeDecoratorGroups.BIRCH_TREE || worldgentreeabstract.e == BiomeDecoratorGroups.BIRCH_TREE_BEES_005) {
+ } else if (worldgentreeabstract.f == BiomeDecoratorGroups.BIRCH || worldgentreeabstract.f == BiomeDecoratorGroups.BIRCH_BEES_005) {
+ BlockSapling.treeType = TreeType.BIRCH;
+ } else if (worldgentreeabstract.e == BiomeDecoratorGroups.TALL_BIRCH_TREE_BEES_0002) {
+ } else if (worldgentreeabstract.f == BiomeDecoratorGroups.SUPER_BIRCH_BEES_0002) {
+ BlockSapling.treeType = TreeType.TALL_BIRCH;
+ } else if (worldgentreeabstract.e == BiomeDecoratorGroups.SWAMP_TREE) {
+ } else if (worldgentreeabstract.f == BiomeDecoratorGroups.SWAMP_TREE) {
+ BlockSapling.treeType = TreeType.SWAMP;
+ } else if (worldgentreeabstract.e == BiomeDecoratorGroups.FANCY_TREE || worldgentreeabstract.e == BiomeDecoratorGroups.FANCY_TREE_BEES_005) {
+ } else if (worldgentreeabstract.f == BiomeDecoratorGroups.FANCY_OAK || worldgentreeabstract.f == BiomeDecoratorGroups.FANCY_OAK_BEES_005) {
+ BlockSapling.treeType = TreeType.BIG_TREE;
+ } else if (worldgentreeabstract.e == BiomeDecoratorGroups.JUNGLE_BUSH) {
+ } else if (worldgentreeabstract.f == BiomeDecoratorGroups.JUNGLE_BUSH) {
+ BlockSapling.treeType = TreeType.JUNGLE_BUSH;
+ } else if (worldgentreeabstract.e == BiomeDecoratorGroups.DARK_OAK_TREE) {
+ } else if (worldgentreeabstract.f == BiomeDecoratorGroups.DARK_OAK) {
+ BlockSapling.treeType = TreeType.DARK_OAK;
+ } else if (worldgentreeabstract.e == BiomeDecoratorGroups.MEGA_SPRUCE_TREE) {
+ } else if (worldgentreeabstract.f == BiomeDecoratorGroups.MEGA_SPRUCE) {
+ BlockSapling.treeType = TreeType.MEGA_REDWOOD;
+ } else if (worldgentreeabstract.e == BiomeDecoratorGroups.MEGA_PINE_TREE) {
+ } else if (worldgentreeabstract.f == BiomeDecoratorGroups.MEGA_PINE) {
+ BlockSapling.treeType = TreeType.MEGA_REDWOOD;
+ } else if (worldgentreeabstract.e == BiomeDecoratorGroups.MEGA_JUNGLE_TREE) {
+ } else if (worldgentreeabstract.f == BiomeDecoratorGroups.MEGA_JUNGLE_TREE) {
+ BlockSapling.treeType = TreeType.JUNGLE;
+ } else {
+ throw new IllegalArgumentException("Unknown tree generator " + worldgentreeabstract);