SPIGOT-7737: Add separate TreeType.MEGA_PINE

PaperMC · Jun 11, 2024 · ee95e17 · ee95e17
1 parent 0dae4c6
commit ee95e17
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/nms-patches/net/minecraft/world/level/block/grower/WorldGenTreeProvider.patch b/nms-patches/net/minecraft/world/level/block/grower/WorldGenTreeProvider.patch
@@ -91,7 +91,7 @@
 +        } else if (worldgentreeabstract == TreeFeatures.MEGA_SPRUCE) {
 +            BlockSapling.treeType = TreeType.MEGA_REDWOOD;
 +        } else if (worldgentreeabstract == TreeFeatures.MEGA_PINE) {
-+            BlockSapling.treeType = TreeType.MEGA_REDWOOD;
++            BlockSapling.treeType = TreeType.MEGA_PINE;
 +        } else if (worldgentreeabstract == TreeFeatures.MEGA_JUNGLE_TREE) {
 +            BlockSapling.treeType = TreeType.JUNGLE;
 +        } else if (worldgentreeabstract == TreeFeatures.AZALEA_TREE) {

diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
@@ -244,6 +244,9 @@ public boolean generateTree(GeneratorAccessSeed access, ChunkGenerator chunkGene
                 gen = TreeFeatures.DARK_OAK;
                 break;
             case MEGA_REDWOOD:
+                gen = TreeFeatures.MEGA_SPRUCE;
+                break;
+            case MEGA_PINE:
                 gen = TreeFeatures.MEGA_PINE;
                 break;
             case TALL_BIRCH: