Parker Hawke / CraftBukkit / 7c49f6279e1

Commits

DerFrZocker authored and md_5 committed 7c49f6279e1 12 Mar 2022

SPIGOT-6895: Trees grown with applyBoneMeal() don't fire the StructureGrowthEvent

src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java

Modified

-1
+package org.bukkit.craftbukkit.block;
-2
-3
+import com.google.common.base.Preconditions;
-+
+import java.util.ArrayList;
-5
+import java.util.Collection;
-6
+import java.util.Collections;
-7
+import java.util.List;
-+
+import java.util.Objects;
-9
+import java.util.stream.Collectors;
-10
+import net.minecraft.core.BlockPosition;
-11
+import net.minecraft.core.EnumDirection;
-12
+import net.minecraft.core.Holder;
-13
+import net.minecraft.core.IRegistry;
-14
+import net.minecraft.resources.ResourceKey;
-15
+import net.minecraft.server.level.WorldServer;
-16
+import net.minecraft.world.EnumHand;
-17
+import net.minecraft.world.EnumInteractionResult;
-18
+import net.minecraft.world.item.ItemBoneMeal;
-19
+import net.minecraft.world.item.Items;
-20
+import net.minecraft.world.item.context.ItemActionContext;
-21
+import net.minecraft.world.level.EnumSkyBlock;
-22
+import net.minecraft.world.level.GeneratorAccess;
-23
+import net.minecraft.world.level.RayTrace;
-24
+import net.minecraft.world.level.biome.BiomeBase;
-25
+import net.minecraft.world.level.block.BlockRedstoneWire;
-+
+import net.minecraft.world.level.block.BlockSapling;
-27
+import net.minecraft.world.level.block.Blocks;
-28
+import net.minecraft.world.level.block.state.IBlockData;
-29
+import net.minecraft.world.phys.AxisAlignedBB;
-30
+import net.minecraft.world.phys.MovingObjectPosition;
-31
+import net.minecraft.world.phys.MovingObjectPositionBlock;
-32
+import net.minecraft.world.phys.Vec3D;
-33
+import net.minecraft.world.phys.shapes.VoxelShape;
-34
+import org.apache.commons.lang.Validate;
-+
+import org.bukkit.Bukkit;
-36
+import org.bukkit.Chunk;
-37
+import org.bukkit.FluidCollisionMode;
-38
+import org.bukkit.Location;
-39
+import org.bukkit.Material;
-40
+import org.bukkit.Registry;
-+
+import org.bukkit.TreeType;
-42
+import org.bukkit.World;
-43
+import org.bukkit.block.Biome;
-44
+import org.bukkit.block.Block;
-45
+import org.bukkit.block.BlockFace;
-46
+import org.bukkit.block.BlockState;
-47
+import org.bukkit.block.PistonMoveReaction;
-48
+import org.bukkit.block.data.BlockData;
-49
+import org.bukkit.craftbukkit.CraftFluidCollisionMode;
-50
+import org.bukkit.craftbukkit.CraftWorld;
-51
+import org.bukkit.craftbukkit.block.data.CraftBlockData;
-52
+import org.bukkit.craftbukkit.entity.CraftEntity;
-53
+import org.bukkit.craftbukkit.entity.CraftPlayer;
-54
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
-55
+import org.bukkit.craftbukkit.util.CraftMagicNumbers;
-56
+import org.bukkit.craftbukkit.util.CraftNamespacedKey;
-57
+import org.bukkit.craftbukkit.util.CraftRayTraceResult;
-58
+import org.bukkit.craftbukkit.util.CraftVoxelShape;
-59
+import org.bukkit.entity.Entity;
-60
+import org.bukkit.entity.Player;
-+
+import org.bukkit.event.block.BlockFertilizeEvent;
-+
+import org.bukkit.event.world.StructureGrowEvent;
-63
+import org.bukkit.inventory.ItemStack;
-64
+import org.bukkit.metadata.MetadataValue;
-65
+import org.bukkit.plugin.Plugin;
-66
+import org.bukkit.util.BlockVector;
-67
+import org.bukkit.util.BoundingBox;
-68
+import org.bukkit.util.RayTraceResult;
-69
+import org.bukkit.util.Vector;
-70
-71
+public class CraftBlock implements Block {
-72
+    private final net.minecraft.world.level.GeneratorAccess world;
-483
+            result = true;
-484
+        }
-485
-486
+        // SPIGOT-6778: Directly call setBlock instead of setTypeAndData, so that the tile entiy is not removed and custom remove logic is run.
-487
+        return world.setBlock(position, Blocks.AIR.defaultBlockState(), 3) && result;
-488
+    }
-489
-490
+    @Override
-491
+    public boolean applyBoneMeal(BlockFace face) {
-492
+        EnumDirection direction = blockFaceToNotch(face);
--
+        ItemActionContext context = new ItemActionContext(getCraftWorld().getHandle(), null, EnumHand.MAIN_HAND, Items.BONE_MEAL.getDefaultInstance(), new MovingObjectPositionBlock(Vec3D.ZERO, direction, getPosition(), false));
-+
+        BlockFertilizeEvent event = null;
-+
+        WorldServer world = getCraftWorld().getHandle();
-+
+        ItemActionContext context = new ItemActionContext(world, null, EnumHand.MAIN_HAND, Items.BONE_MEAL.getDefaultInstance(), new MovingObjectPositionBlock(Vec3D.ZERO, direction, getPosition(), false));
-+
-+
+        // SPIGOT-6895: Call StructureGrowEvent and BlockFertilizeEvent
-+
+        world.captureTreeGeneration = true;
-+
+        EnumInteractionResult result = ItemBoneMeal.applyBonemeal(context);
-+
+        world.captureTreeGeneration = false;
-+
-+
+        if (world.capturedBlockStates.size() > 0) {
-+
+            TreeType treeType = BlockSapling.treeType;
-+
+            BlockSapling.treeType = null;
-+
+            List<BlockState> blocks = new ArrayList<>(world.capturedBlockStates.values());
-+
+            world.capturedBlockStates.clear();
-+
+            StructureGrowEvent structureEvent = null;
-+
-+
+            if (treeType != null) {
-+
+                structureEvent = new StructureGrowEvent(getLocation(), treeType, true, null, blocks);
-+
+                Bukkit.getPluginManager().callEvent(structureEvent);
-+
+            }
-+
-+
+            event = new BlockFertilizeEvent(CraftBlock.at(world, getPosition()), null, blocks);
-+
+            event.setCancelled(structureEvent != null && structureEvent.isCancelled());
-+
+            Bukkit.getPluginManager().callEvent(event);
-+
-+
+            if (!event.isCancelled()) {
-+
+                for (BlockState blockstate : blocks) {
-+
+                    blockstate.update(true);
-+
+                }
-+
+            }
-+
+        }
-524
--
+        return ItemBoneMeal.applyBonemeal(context) == EnumInteractionResult.SUCCESS;
-+
+        return result == EnumInteractionResult.SUCCESS && (event == null || !event.isCancelled());
-526
+    }
-527
-528
+    @Override
-529
+    public Collection<ItemStack> getDrops() {
-530
+        return getDrops(null);
-531
+    }
-532
-533
+    @Override
-534
+    public Collection<ItemStack> getDrops(ItemStack item) {
-535
+        return getDrops(item, null);

CraftBukkit

Commits

Jira Issues

Add shortcut