From ee95e171a0761467c09e0657583a5636d7ae7d3c Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 11 Jun 2024 21:04:56 +1000 Subject: [PATCH] SPIGOT-7737: Add separate TreeType.MEGA_PINE --- .../world/level/block/grower/WorldGenTreeProvider.patch | 2 +- src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java | 3 +++ 2 files changed, 4 insertions(+), 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 index cfdcb85f8..61f547d2a 100644 --- 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 index 97b27c682..f91a5ab4f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java +++ b/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: