From 1ded727925a2c8080c459176e58209395f087f41 Mon Sep 17 00:00:00 2001 From: CraftBukkit/Spigot Date: Tue, 11 Jun 2024 21:04:56 +1000 Subject: [PATCH] SPIGOT-7737: Add separate TreeType.MEGA_PINE By: md_5 --- .../world/level/block/grower/WorldGenTreeProvider.patch | 2 +- .../main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/paper-server/nms-patches/net/minecraft/world/level/block/grower/WorldGenTreeProvider.patch b/paper-server/nms-patches/net/minecraft/world/level/block/grower/WorldGenTreeProvider.patch index cfdcb85f8a..61f547d2a9 100644 --- a/paper-server/nms-patches/net/minecraft/world/level/block/grower/WorldGenTreeProvider.patch +++ b/paper-server/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/paper-server/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java index 97b27c682a..f91a5ab4f0 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java @@ -244,6 +244,9 @@ public abstract class CraftRegionAccessor implements RegionAccessor { gen = TreeFeatures.DARK_OAK; break; case MEGA_REDWOOD: + gen = TreeFeatures.MEGA_SPRUCE; + break; + case MEGA_PINE: gen = TreeFeatures.MEGA_PINE; break; case TALL_BIRCH: