mirror of
https://hub.spigotmc.org/stash/scm/spigot/craftbukkit.git
synced 2024-11-22 08:56:16 +00:00
61 lines
3.0 KiB
Diff
61 lines
3.0 KiB
Diff
--- a/net/minecraft/world/level/block/BlockSapling.java
|
|
+++ b/net/minecraft/world/level/block/BlockSapling.java
|
|
@@ -17,6 +17,15 @@
|
|
import net.minecraft.world.phys.shapes.VoxelShape;
|
|
import net.minecraft.world.phys.shapes.VoxelShapeCollision;
|
|
|
|
+// CraftBukkit start
|
|
+import org.bukkit.Location;
|
|
+import org.bukkit.TreeType;
|
|
+import org.bukkit.block.BlockState;
|
|
+import org.bukkit.craftbukkit.block.CapturedBlockState;
|
|
+import org.bukkit.craftbukkit.util.CraftLocation;
|
|
+import org.bukkit.event.world.StructureGrowEvent;
|
|
+// CraftBukkit end
|
|
+
|
|
public class BlockSapling extends BlockPlant implements IBlockFragilePlantElement {
|
|
|
|
public static final MapCodec<BlockSapling> CODEC = RecordCodecBuilder.mapCodec((instance) -> {
|
|
@@ -28,6 +37,7 @@
|
|
protected static final float AABB_OFFSET = 6.0F;
|
|
protected static final VoxelShape SHAPE = Block.box(2.0D, 0.0D, 2.0D, 14.0D, 12.0D, 14.0D);
|
|
protected final WorldGenTreeProvider treeGrower;
|
|
+ public static TreeType treeType; // CraftBukkit
|
|
|
|
@Override
|
|
public MapCodec<? extends BlockSapling> codec() {
|
|
@@ -57,7 +67,32 @@
|
|
if ((Integer) iblockdata.getValue(BlockSapling.STAGE) == 0) {
|
|
worldserver.setBlock(blockposition, (IBlockData) iblockdata.cycle(BlockSapling.STAGE), 4);
|
|
} else {
|
|
- this.treeGrower.growTree(worldserver, worldserver.getChunkSource().getGenerator(), blockposition, iblockdata, randomsource);
|
|
+ // CraftBukkit start
|
|
+ if (worldserver.captureTreeGeneration) {
|
|
+ this.treeGrower.growTree(worldserver, worldserver.getChunkSource().getGenerator(), blockposition, iblockdata, randomsource);
|
|
+ } else {
|
|
+ worldserver.captureTreeGeneration = true;
|
|
+ this.treeGrower.growTree(worldserver, worldserver.getChunkSource().getGenerator(), blockposition, iblockdata, randomsource);
|
|
+ worldserver.captureTreeGeneration = false;
|
|
+ if (worldserver.capturedBlockStates.size() > 0) {
|
|
+ TreeType treeType = BlockSapling.treeType;
|
|
+ BlockSapling.treeType = null;
|
|
+ Location location = CraftLocation.toBukkit(blockposition, worldserver.getWorld());
|
|
+ java.util.List<BlockState> blocks = new java.util.ArrayList<>(worldserver.capturedBlockStates.values());
|
|
+ worldserver.capturedBlockStates.clear();
|
|
+ StructureGrowEvent event = null;
|
|
+ if (treeType != null) {
|
|
+ event = new StructureGrowEvent(location, treeType, false, null, blocks);
|
|
+ org.bukkit.Bukkit.getPluginManager().callEvent(event);
|
|
+ }
|
|
+ if (event == null || !event.isCancelled()) {
|
|
+ for (BlockState blockstate : blocks) {
|
|
+ CapturedBlockState.setBlockState(blockstate);
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+ // CraftBukkit end
|
|
}
|
|
|
|
}
|