Remap CraftBukkit to Mojang+Yarn Mappings

By: Initial Source <noreply+automated@papermc.io>

paper-server/patches/sources/net/minecraft/core/cauldron/CauldronInteraction.java.patch

@@ -0,0 +1,195 @@
+--- a/net/minecraft/core/cauldron/CauldronInteraction.java
++++ b/net/minecraft/core/cauldron/CauldronInteraction.java
+@@ -35,15 +35,20 @@
+ import net.minecraft.world.level.block.state.BlockState;
+ import net.minecraft.world.level.gameevent.GameEvent;
+ import net.minecraft.world.level.material.FluidState;
++// CraftBukkit start
++import org.bukkit.event.block.CauldronLevelChangeEvent;
++// CraftBukkit end
+ 
+ public interface CauldronInteraction {
+ 
+     Map<String, CauldronInteraction.InteractionMap> INTERACTIONS = new Object2ObjectArrayMap();
+-    Codec<CauldronInteraction.InteractionMap> CODEC;
+-    CauldronInteraction.InteractionMap EMPTY;
+-    CauldronInteraction.InteractionMap WATER;
+-    CauldronInteraction.InteractionMap LAVA;
+-    CauldronInteraction.InteractionMap POWDER_SNOW;
++    // CraftBukkit start - decompile errors
++    Codec<CauldronInteraction.InteractionMap> CODEC = Codec.stringResolver(CauldronInteraction.InteractionMap::name, CauldronInteraction.INTERACTIONS::get);
++    CauldronInteraction.InteractionMap EMPTY = CauldronInteraction.newInteractionMap("empty");
++    CauldronInteraction.InteractionMap WATER = CauldronInteraction.newInteractionMap("water");
++    CauldronInteraction.InteractionMap LAVA = CauldronInteraction.newInteractionMap("lava");
++    CauldronInteraction.InteractionMap POWDER_SNOW = CauldronInteraction.newInteractionMap("powder_snow");
++    // CraftBukkit end
+ 
+     static CauldronInteraction.InteractionMap newInteractionMap(String name) {
+         Object2ObjectOpenHashMap<Item, CauldronInteraction> object2objectopenhashmap = new Object2ObjectOpenHashMap();
+@@ -68,12 +73,17 @@
+ 
+             if (potioncontents != null && potioncontents.is(Potions.WATER)) {
+                 if (!world.isClientSide) {
++                    // CraftBukkit start
++                    if (!LayeredCauldronBlock.changeLevel(iblockdata, world, blockposition, Blocks.WATER_CAULDRON.defaultBlockState(), entityhuman, CauldronLevelChangeEvent.ChangeReason.BOTTLE_EMPTY)) {
++                        return InteractionResult.SUCCESS;
++                    }
++                    // CraftBukkit end
+                     Item item = itemstack.getItem();
+ 
+                     entityhuman.setItemInHand(enumhand, ItemUtils.createFilledResult(itemstack, entityhuman, new ItemStack(Items.GLASS_BOTTLE)));
+                     entityhuman.awardStat(Stats.USE_CAULDRON);
+                     entityhuman.awardStat(Stats.ITEM_USED.get(item));
+-                    world.setBlockAndUpdate(blockposition, Blocks.WATER_CAULDRON.defaultBlockState());
++                    // world.setBlockAndUpdate(blockposition, Blocks.WATER_CAULDRON.defaultBlockState()); // CraftBukkit
+                     world.playSound((Player) null, blockposition, SoundEvents.BOTTLE_EMPTY, SoundSource.BLOCKS, 1.0F, 1.0F);
+                     world.gameEvent((Entity) null, (Holder) GameEvent.FLUID_PLACE, blockposition);
+                 }
+@@ -93,12 +103,17 @@
+         });
+         map1.put(Items.GLASS_BOTTLE, (iblockdata, world, blockposition, entityhuman, enumhand, itemstack) -> {
+             if (!world.isClientSide) {
++                // CraftBukkit start
++                if (!LayeredCauldronBlock.lowerFillLevel(iblockdata, world, blockposition, entityhuman, CauldronLevelChangeEvent.ChangeReason.BOTTLE_FILL)) {
++                    return InteractionResult.SUCCESS;
++                }
++                // CraftBukkit end
+                 Item item = itemstack.getItem();
+ 
+                 entityhuman.setItemInHand(enumhand, ItemUtils.createFilledResult(itemstack, entityhuman, PotionContents.createItemStack(Items.POTION, Potions.WATER)));
+                 entityhuman.awardStat(Stats.USE_CAULDRON);
+                 entityhuman.awardStat(Stats.ITEM_USED.get(item));
+-                LayeredCauldronBlock.lowerFillLevel(iblockdata, world, blockposition);
++                // LayeredCauldronBlock.lowerFillLevel(iblockdata, world, blockposition); // CraftBukkit
+                 world.playSound((Player) null, blockposition, SoundEvents.BOTTLE_FILL, SoundSource.BLOCKS, 1.0F, 1.0F);
+                 world.gameEvent((Entity) null, (Holder) GameEvent.FLUID_PICKUP, blockposition);
+             }
+@@ -113,10 +128,15 @@
+ 
+                 if (potioncontents != null && potioncontents.is(Potions.WATER)) {
+                     if (!world.isClientSide) {
++                        // CraftBukkit start
++                        if (!LayeredCauldronBlock.changeLevel(iblockdata, world, blockposition, iblockdata.cycle(LayeredCauldronBlock.LEVEL), entityhuman, CauldronLevelChangeEvent.ChangeReason.BOTTLE_EMPTY)) {
++                            return InteractionResult.SUCCESS;
++                        }
++                        // CraftBukkit end
+                         entityhuman.setItemInHand(enumhand, ItemUtils.createFilledResult(itemstack, entityhuman, new ItemStack(Items.GLASS_BOTTLE)));
+                         entityhuman.awardStat(Stats.USE_CAULDRON);
+                         entityhuman.awardStat(Stats.ITEM_USED.get(itemstack.getItem()));
+-                        world.setBlockAndUpdate(blockposition, (BlockState) iblockdata.cycle(LayeredCauldronBlock.LEVEL));
++                        // world.setBlockAndUpdate(blockposition, (IBlockData) iblockdata.cycle(LayeredCauldronBlock.LEVEL)); // CraftBukkit
+                         world.playSound((Player) null, blockposition, SoundEvents.BOTTLE_EMPTY, SoundSource.BLOCKS, 1.0F, 1.0F);
+                         world.gameEvent((Entity) null, (Holder) GameEvent.FLUID_PLACE, blockposition);
+                     }
+@@ -194,12 +214,17 @@
+             return InteractionResult.TRY_WITH_EMPTY_HAND;
+         } else {
+             if (!world.isClientSide) {
++                // CraftBukkit start
++                if (!LayeredCauldronBlock.changeLevel(state, world, pos, Blocks.CAULDRON.defaultBlockState(), player, CauldronLevelChangeEvent.ChangeReason.BUCKET_FILL)) {
++                    return InteractionResult.SUCCESS;
++                }
++                // CraftBukkit end
+                 Item item = stack.getItem();
+ 
+                 player.setItemInHand(hand, ItemUtils.createFilledResult(stack, player, output));
+                 player.awardStat(Stats.USE_CAULDRON);
+                 player.awardStat(Stats.ITEM_USED.get(item));
+-                world.setBlockAndUpdate(pos, Blocks.CAULDRON.defaultBlockState());
++                // world.setBlockAndUpdate(blockposition, Blocks.CAULDRON.defaultBlockState()); // CraftBukkit
+                 world.playSound((Player) null, pos, soundEvent, SoundSource.BLOCKS, 1.0F, 1.0F);
+                 world.gameEvent((Entity) null, (Holder) GameEvent.FLUID_PICKUP, pos);
+             }
+@@ -210,12 +235,17 @@
+ 
+     static InteractionResult emptyBucket(Level world, BlockPos pos, Player player, InteractionHand hand, ItemStack stack, BlockState state, SoundEvent soundEvent) {
+         if (!world.isClientSide) {
++            // CraftBukkit start
++            if (!LayeredCauldronBlock.changeLevel(state, world, pos, state, player, CauldronLevelChangeEvent.ChangeReason.BUCKET_EMPTY)) {
++                return InteractionResult.SUCCESS;
++            }
++            // CraftBukkit end
+             Item item = stack.getItem();
+ 
+             player.setItemInHand(hand, ItemUtils.createFilledResult(stack, player, new ItemStack(Items.BUCKET)));
+             player.awardStat(Stats.FILL_CAULDRON);
+             player.awardStat(Stats.ITEM_USED.get(item));
+-            world.setBlockAndUpdate(pos, state);
++            // world.setBlockAndUpdate(blockposition, iblockdata); // CraftBukkit
+             world.playSound((Player) null, pos, soundEvent, SoundSource.BLOCKS, 1.0F, 1.0F);
+             world.gameEvent((Entity) null, (Holder) GameEvent.FLUID_PLACE, pos);
+         }
+@@ -242,11 +272,16 @@
+             return InteractionResult.TRY_WITH_EMPTY_HAND;
+         } else {
+             if (!world.isClientSide) {
++                // CraftBukkit start
++                if (!LayeredCauldronBlock.lowerFillLevel(state, world, pos, player, CauldronLevelChangeEvent.ChangeReason.SHULKER_WASH)) {
++                    return InteractionResult.SUCCESS;
++                }
++                // CraftBukkit end
+                 ItemStack itemstack1 = stack.transmuteCopy(Blocks.SHULKER_BOX, 1);
+ 
+                 player.setItemInHand(hand, ItemUtils.createFilledResult(stack, player, itemstack1, false));
+                 player.awardStat(Stats.CLEAN_SHULKER_BOX);
+-                LayeredCauldronBlock.lowerFillLevel(state, world, pos);
++                // LayeredCauldronBlock.lowerFillLevel(iblockdata, world, blockposition); // CraftBukkit
+             }
+ 
+             return InteractionResult.SUCCESS;
+@@ -260,12 +295,17 @@
+             return InteractionResult.TRY_WITH_EMPTY_HAND;
+         } else {
+             if (!world.isClientSide) {
++                // CraftBukkit start
++                if (!LayeredCauldronBlock.lowerFillLevel(state, world, pos, player, CauldronLevelChangeEvent.ChangeReason.BANNER_WASH)) {
++                    return InteractionResult.SUCCESS;
++                }
++                // CraftBukkit end
+                 ItemStack itemstack1 = stack.copyWithCount(1);
+ 
+                 itemstack1.set(DataComponents.BANNER_PATTERNS, bannerpatternlayers.removeLast());
+                 player.setItemInHand(hand, ItemUtils.createFilledResult(stack, player, itemstack1, false));
+                 player.awardStat(Stats.CLEAN_BANNER);
+-                LayeredCauldronBlock.lowerFillLevel(state, world, pos);
++                // LayeredCauldronBlock.lowerFillLevel(iblockdata, world, blockposition); // CraftBukkit
+             }
+ 
+             return InteractionResult.SUCCESS;
+@@ -279,9 +319,14 @@
+             return InteractionResult.TRY_WITH_EMPTY_HAND;
+         } else {
+             if (!world.isClientSide) {
++                // CraftBukkit start
++                if (!LayeredCauldronBlock.lowerFillLevel(state, world, pos, player, CauldronLevelChangeEvent.ChangeReason.ARMOR_WASH)) {
++                    return InteractionResult.SUCCESS;
++                }
++                // CraftBukkit end
+                 stack.remove(DataComponents.DYED_COLOR);
+                 player.awardStat(Stats.CLEAN_ARMOR);
+-                LayeredCauldronBlock.lowerFillLevel(state, world, pos);
++                // LayeredCauldronBlock.lowerFillLevel(iblockdata, world, blockposition); // CraftBukkit
+             }
+ 
+             return InteractionResult.SUCCESS;
+@@ -294,8 +339,10 @@
+         return fluid.is(FluidTags.WATER);
+     }
+ 
++    // CraftBukkit start - decompile errors
++    /*
+     static {
+-        Function function = CauldronInteraction.InteractionMap::name;
++        Function function = CauldronInteraction.a::name;
+         Map map = CauldronInteraction.INTERACTIONS;
+ 
+         Objects.requireNonNull(map);
+@@ -305,6 +352,8 @@
+         LAVA = newInteractionMap("lava");
+         POWDER_SNOW = newInteractionMap("powder_snow");
+     }
++     */
++    // CraftBukkit end
+ 
+     public static record InteractionMap(String name, Map<Item, CauldronInteraction> map) {
+ 

paper-server/patches/sources/net/minecraft/core/cauldron/CauldronInteraction.patch

@@ -1,192 +0,0 @@
---- a/net/minecraft/core/cauldron/CauldronInteraction.java
-+++ b/net/minecraft/core/cauldron/CauldronInteraction.java
-@@ -36,14 +36,20 @@
- import net.minecraft.world.level.gameevent.GameEvent;
- import net.minecraft.world.level.material.Fluid;
- 
-+// CraftBukkit start
-+import org.bukkit.event.block.CauldronLevelChangeEvent;
-+// CraftBukkit end
-+
- public interface CauldronInteraction {
- 
-     Map<String, CauldronInteraction.a> INTERACTIONS = new Object2ObjectArrayMap();
--    Codec<CauldronInteraction.a> CODEC;
--    CauldronInteraction.a EMPTY;
--    CauldronInteraction.a WATER;
--    CauldronInteraction.a LAVA;
--    CauldronInteraction.a POWDER_SNOW;
-+    // CraftBukkit start - decompile errors
-+    Codec<CauldronInteraction.a> CODEC = Codec.stringResolver(CauldronInteraction.a::name, CauldronInteraction.INTERACTIONS::get);
-+    CauldronInteraction.a EMPTY = newInteractionMap("empty");
-+    CauldronInteraction.a WATER = newInteractionMap("water");
-+    CauldronInteraction.a LAVA = newInteractionMap("lava");
-+    CauldronInteraction.a POWDER_SNOW = newInteractionMap("powder_snow");
-+    // CraftBukkit end
- 
-     static CauldronInteraction.a newInteractionMap(String s) {
-         Object2ObjectOpenHashMap<Item, CauldronInteraction> object2objectopenhashmap = new Object2ObjectOpenHashMap();
-@@ -68,12 +74,17 @@
- 
-             if (potioncontents != null && potioncontents.is(Potions.WATER)) {
-                 if (!world.isClientSide) {
-+                    // CraftBukkit start
-+                    if (!LayeredCauldronBlock.changeLevel(iblockdata, world, blockposition, Blocks.WATER_CAULDRON.defaultBlockState(), entityhuman, CauldronLevelChangeEvent.ChangeReason.BOTTLE_EMPTY)) {
-+                        return EnumInteractionResult.SUCCESS;
-+                    }
-+                    // CraftBukkit end
-                     Item item = itemstack.getItem();
- 
-                     entityhuman.setItemInHand(enumhand, ItemLiquidUtil.createFilledResult(itemstack, entityhuman, new ItemStack(Items.GLASS_BOTTLE)));
-                     entityhuman.awardStat(StatisticList.USE_CAULDRON);
-                     entityhuman.awardStat(StatisticList.ITEM_USED.get(item));
--                    world.setBlockAndUpdate(blockposition, Blocks.WATER_CAULDRON.defaultBlockState());
-+                    // world.setBlockAndUpdate(blockposition, Blocks.WATER_CAULDRON.defaultBlockState()); // CraftBukkit
-                     world.playSound((EntityHuman) null, blockposition, SoundEffects.BOTTLE_EMPTY, SoundCategory.BLOCKS, 1.0F, 1.0F);
-                     world.gameEvent((Entity) null, (Holder) GameEvent.FLUID_PLACE, blockposition);
-                 }
-@@ -93,12 +104,17 @@
-         });
-         map1.put(Items.GLASS_BOTTLE, (iblockdata, world, blockposition, entityhuman, enumhand, itemstack) -> {
-             if (!world.isClientSide) {
-+                // CraftBukkit start
-+                if (!LayeredCauldronBlock.lowerFillLevel(iblockdata, world, blockposition, entityhuman, CauldronLevelChangeEvent.ChangeReason.BOTTLE_FILL)) {
-+                    return EnumInteractionResult.SUCCESS;
-+                }
-+                // CraftBukkit end
-                 Item item = itemstack.getItem();
- 
-                 entityhuman.setItemInHand(enumhand, ItemLiquidUtil.createFilledResult(itemstack, entityhuman, PotionContents.createItemStack(Items.POTION, Potions.WATER)));
-                 entityhuman.awardStat(StatisticList.USE_CAULDRON);
-                 entityhuman.awardStat(StatisticList.ITEM_USED.get(item));
--                LayeredCauldronBlock.lowerFillLevel(iblockdata, world, blockposition);
-+                // LayeredCauldronBlock.lowerFillLevel(iblockdata, world, blockposition); // CraftBukkit
-                 world.playSound((EntityHuman) null, blockposition, SoundEffects.BOTTLE_FILL, SoundCategory.BLOCKS, 1.0F, 1.0F);
-                 world.gameEvent((Entity) null, (Holder) GameEvent.FLUID_PICKUP, blockposition);
-             }
-@@ -113,10 +129,15 @@
- 
-                 if (potioncontents != null && potioncontents.is(Potions.WATER)) {
-                     if (!world.isClientSide) {
-+                        // CraftBukkit start
-+                        if (!LayeredCauldronBlock.changeLevel(iblockdata, world, blockposition, iblockdata.cycle(LayeredCauldronBlock.LEVEL), entityhuman, CauldronLevelChangeEvent.ChangeReason.BOTTLE_EMPTY)) {
-+                            return EnumInteractionResult.SUCCESS;
-+                        }
-+                        // CraftBukkit end
-                         entityhuman.setItemInHand(enumhand, ItemLiquidUtil.createFilledResult(itemstack, entityhuman, new ItemStack(Items.GLASS_BOTTLE)));
-                         entityhuman.awardStat(StatisticList.USE_CAULDRON);
-                         entityhuman.awardStat(StatisticList.ITEM_USED.get(itemstack.getItem()));
--                        world.setBlockAndUpdate(blockposition, (IBlockData) iblockdata.cycle(LayeredCauldronBlock.LEVEL));
-+                        // world.setBlockAndUpdate(blockposition, (IBlockData) iblockdata.cycle(LayeredCauldronBlock.LEVEL)); // CraftBukkit
-                         world.playSound((EntityHuman) null, blockposition, SoundEffects.BOTTLE_EMPTY, SoundCategory.BLOCKS, 1.0F, 1.0F);
-                         world.gameEvent((Entity) null, (Holder) GameEvent.FLUID_PLACE, blockposition);
-                     }
-@@ -194,12 +215,17 @@
-             return EnumInteractionResult.TRY_WITH_EMPTY_HAND;
-         } else {
-             if (!world.isClientSide) {
-+                // CraftBukkit start
-+                if (!LayeredCauldronBlock.changeLevel(iblockdata, world, blockposition, Blocks.CAULDRON.defaultBlockState(), entityhuman, CauldronLevelChangeEvent.ChangeReason.BUCKET_FILL)) {
-+                    return EnumInteractionResult.SUCCESS;
-+                }
-+                // CraftBukkit end
-                 Item item = itemstack.getItem();
- 
-                 entityhuman.setItemInHand(enumhand, ItemLiquidUtil.createFilledResult(itemstack, entityhuman, itemstack1));
-                 entityhuman.awardStat(StatisticList.USE_CAULDRON);
-                 entityhuman.awardStat(StatisticList.ITEM_USED.get(item));
--                world.setBlockAndUpdate(blockposition, Blocks.CAULDRON.defaultBlockState());
-+                // world.setBlockAndUpdate(blockposition, Blocks.CAULDRON.defaultBlockState()); // CraftBukkit
-                 world.playSound((EntityHuman) null, blockposition, soundeffect, SoundCategory.BLOCKS, 1.0F, 1.0F);
-                 world.gameEvent((Entity) null, (Holder) GameEvent.FLUID_PICKUP, blockposition);
-             }
-@@ -210,12 +236,17 @@
- 
-     static EnumInteractionResult emptyBucket(World world, BlockPosition blockposition, EntityHuman entityhuman, EnumHand enumhand, ItemStack itemstack, IBlockData iblockdata, SoundEffect soundeffect) {
-         if (!world.isClientSide) {
-+            // CraftBukkit start
-+            if (!LayeredCauldronBlock.changeLevel(iblockdata, world, blockposition, iblockdata, entityhuman, CauldronLevelChangeEvent.ChangeReason.BUCKET_EMPTY)) {
-+                return EnumInteractionResult.SUCCESS;
-+            }
-+            // CraftBukkit end
-             Item item = itemstack.getItem();
- 
-             entityhuman.setItemInHand(enumhand, ItemLiquidUtil.createFilledResult(itemstack, entityhuman, new ItemStack(Items.BUCKET)));
-             entityhuman.awardStat(StatisticList.FILL_CAULDRON);
-             entityhuman.awardStat(StatisticList.ITEM_USED.get(item));
--            world.setBlockAndUpdate(blockposition, iblockdata);
-+            // world.setBlockAndUpdate(blockposition, iblockdata); // CraftBukkit
-             world.playSound((EntityHuman) null, blockposition, soundeffect, SoundCategory.BLOCKS, 1.0F, 1.0F);
-             world.gameEvent((Entity) null, (Holder) GameEvent.FLUID_PLACE, blockposition);
-         }
-@@ -242,11 +273,16 @@
-             return EnumInteractionResult.TRY_WITH_EMPTY_HAND;
-         } else {
-             if (!world.isClientSide) {
-+                // CraftBukkit start
-+                if (!LayeredCauldronBlock.lowerFillLevel(iblockdata, world, blockposition, entityhuman, CauldronLevelChangeEvent.ChangeReason.SHULKER_WASH)) {
-+                    return EnumInteractionResult.SUCCESS;
-+                }
-+                // CraftBukkit end
-                 ItemStack itemstack1 = itemstack.transmuteCopy(Blocks.SHULKER_BOX, 1);
- 
-                 entityhuman.setItemInHand(enumhand, ItemLiquidUtil.createFilledResult(itemstack, entityhuman, itemstack1, false));
-                 entityhuman.awardStat(StatisticList.CLEAN_SHULKER_BOX);
--                LayeredCauldronBlock.lowerFillLevel(iblockdata, world, blockposition);
-+                // LayeredCauldronBlock.lowerFillLevel(iblockdata, world, blockposition); // CraftBukkit
-             }
- 
-             return EnumInteractionResult.SUCCESS;
-@@ -260,12 +296,17 @@
-             return EnumInteractionResult.TRY_WITH_EMPTY_HAND;
-         } else {
-             if (!world.isClientSide) {
-+                // CraftBukkit start
-+                if (!LayeredCauldronBlock.lowerFillLevel(iblockdata, world, blockposition, entityhuman, CauldronLevelChangeEvent.ChangeReason.BANNER_WASH)) {
-+                    return EnumInteractionResult.SUCCESS;
-+                }
-+                // CraftBukkit end
-                 ItemStack itemstack1 = itemstack.copyWithCount(1);
- 
-                 itemstack1.set(DataComponents.BANNER_PATTERNS, bannerpatternlayers.removeLast());
-                 entityhuman.setItemInHand(enumhand, ItemLiquidUtil.createFilledResult(itemstack, entityhuman, itemstack1, false));
-                 entityhuman.awardStat(StatisticList.CLEAN_BANNER);
--                LayeredCauldronBlock.lowerFillLevel(iblockdata, world, blockposition);
-+                // LayeredCauldronBlock.lowerFillLevel(iblockdata, world, blockposition); // CraftBukkit
-             }
- 
-             return EnumInteractionResult.SUCCESS;
-@@ -279,9 +320,14 @@
-             return EnumInteractionResult.TRY_WITH_EMPTY_HAND;
-         } else {
-             if (!world.isClientSide) {
-+                // CraftBukkit start
-+                if (!LayeredCauldronBlock.lowerFillLevel(iblockdata, world, blockposition, entityhuman, CauldronLevelChangeEvent.ChangeReason.ARMOR_WASH)) {
-+                    return EnumInteractionResult.SUCCESS;
-+                }
-+                // CraftBukkit end
-                 itemstack.remove(DataComponents.DYED_COLOR);
-                 entityhuman.awardStat(StatisticList.CLEAN_ARMOR);
--                LayeredCauldronBlock.lowerFillLevel(iblockdata, world, blockposition);
-+                // LayeredCauldronBlock.lowerFillLevel(iblockdata, world, blockposition); // CraftBukkit
-             }
- 
-             return EnumInteractionResult.SUCCESS;
-@@ -294,6 +340,8 @@
-         return fluid.is(TagsFluid.WATER);
-     }
- 
-+    // CraftBukkit start - decompile errors
-+    /*
-     static {
-         Function function = CauldronInteraction.a::name;
-         Map map = CauldronInteraction.INTERACTIONS;
-@@ -305,6 +353,8 @@
-         LAVA = newInteractionMap("lava");
-         POWDER_SNOW = newInteractionMap("powder_snow");
-     }
-+     */
-+    // CraftBukkit end
- 
-     public static record a(String name, Map<Item, CauldronInteraction> map) {
- 

paper-server/patches/sources/net/minecraft/core/component/DataComponentPatch.java.patch

@@ -12,16 +12,17 @@
 @@ -144,7 +144,7 @@
          }
  
-         private static <T> void encodeComponent(RegistryFriendlyByteBuf registryfriendlybytebuf, DataComponentType<T> datacomponenttype, Object object) {
--            datacomponenttype.streamCodec().encode(registryfriendlybytebuf, object);
-+            datacomponenttype.streamCodec().encode(registryfriendlybytebuf, (T) object); // CraftBukkit - decompile error
+         private static <T> void encodeComponent(RegistryFriendlyByteBuf buf, DataComponentType<T> type, Object value) {
+-            type.streamCodec().encode(buf, value);
++            type.streamCodec().encode(buf, (T) value); // CraftBukkit - decompile error
          }
      };
      private static final String REMOVED_PREFIX = "!";
-@@ -271,6 +271,42 @@
- 
-         a() {}
+@@ -270,7 +270,43 @@
+         private final Reference2ObjectMap<DataComponentType<?>, Optional<?>> map = new Reference2ObjectArrayMap();
  
+         Builder() {}
++
 +        // CraftBukkit start
 +        public void copy(DataComponentPatch orig) {
 +            this.map.putAll(orig.map);
@@ -32,20 +33,20 @@
 +        }
 +
 +        public boolean isSet(DataComponentType<?> type) {
-+            return map.containsKey(type);
++            return this.map.containsKey(type);
 +        }
 +
 +        public boolean isEmpty() {
 +            return this.map.isEmpty();
 +        }
-+
+ 
 +        @Override
 +        public boolean equals(Object object) {
 +            if (this == object) {
 +                return true;
 +            }
 +
-+            if (object instanceof DataComponentPatch.a patch) {
++            if (object instanceof DataComponentPatch.Builder patch) {
 +                return this.map.equals(patch.map);
 +            }
 +
@@ -58,6 +59,6 @@
 +        }
 +        // CraftBukkit end
 +
-         public <T> DataComponentPatch.a set(DataComponentType<T> datacomponenttype, T t0) {
-             this.map.put(datacomponenttype, Optional.of(t0));
+         public <T> DataComponentPatch.Builder set(DataComponentType<T> type, T value) {
+             this.map.put(type, Optional.of(value));
              return this;

paper-server/patches/sources/net/minecraft/core/dispenser/BoatDispenseItemBehavior.java.patch

@@ -1,45 +1,44 @@
---- a/net/minecraft/core/dispenser/DispenseBehaviorBoat.java
-+++ b/net/minecraft/core/dispenser/DispenseBehaviorBoat.java
-@@ -12,6 +12,12 @@
- import net.minecraft.world.level.block.BlockDispenser;
- import net.minecraft.world.phys.Vec3D;
- 
+--- a/net/minecraft/core/dispenser/BoatDispenseItemBehavior.java
++++ b/net/minecraft/core/dispenser/BoatDispenseItemBehavior.java
+@@ -11,6 +11,11 @@
+ import net.minecraft.world.item.ItemStack;
+ import net.minecraft.world.level.block.DispenserBlock;
+ import net.minecraft.world.phys.Vec3;
 +// CraftBukkit start
 +import org.bukkit.craftbukkit.block.CraftBlock;
 +import org.bukkit.craftbukkit.inventory.CraftItemStack;
 +import org.bukkit.event.block.BlockDispenseEvent;
 +// CraftBukkit end
-+
- public class DispenseBehaviorBoat extends DispenseBehaviorItem {
  
-     private final DispenseBehaviorItem defaultDispenseItemBehavior = new DispenseBehaviorItem();
-@@ -43,14 +49,40 @@
+ public class BoatDispenseItemBehavior extends DefaultDispenseItemBehavior {
+ 
+@@ -43,14 +48,40 @@
              d4 = 0.0D;
          }
  
 +        // CraftBukkit start
-+        ItemStack itemstack1 = itemstack.split(1);
-+        org.bukkit.block.Block block = CraftBlock.at(worldserver, sourceblock.pos());
++        ItemStack itemstack1 = stack.split(1);
++        org.bukkit.block.Block block = CraftBlock.at(worldserver, pointer.pos());
 +        CraftItemStack craftItem = CraftItemStack.asCraftMirror(itemstack1);
 +
 +        BlockDispenseEvent event = new BlockDispenseEvent(block, craftItem.clone(), new org.bukkit.util.Vector(d1, d2 + d4, d3));
-+        if (!BlockDispenser.eventFired) {
++        if (!DispenserBlock.eventFired) {
 +            worldserver.getCraftServer().getPluginManager().callEvent(event);
 +        }
 +
 +        if (event.isCancelled()) {
-+            itemstack.grow(1);
-+            return itemstack;
++            stack.grow(1);
++            return stack;
 +        }
 +
 +        if (!event.getItem().equals(craftItem)) {
-+            itemstack.grow(1);
++            stack.grow(1);
 +            // Chain to handler for new item
 +            ItemStack eventStack = CraftItemStack.asNMSCopy(event.getItem());
-+            IDispenseBehavior idispensebehavior = (IDispenseBehavior) BlockDispenser.DISPENSER_REGISTRY.get(eventStack.getItem());
-+            if (idispensebehavior != IDispenseBehavior.NOOP && idispensebehavior != this) {
-+                idispensebehavior.dispense(sourceblock, eventStack);
-+                return itemstack;
++            DispenseItemBehavior idispensebehavior = (DispenseItemBehavior) DispenserBlock.DISPENSER_REGISTRY.get(eventStack.getItem());
++            if (idispensebehavior != DispenseItemBehavior.NOOP && idispensebehavior != this) {
++                idispensebehavior.dispense(pointer, eventStack);
++                return stack;
 +            }
 +        }
 +        // CraftBukkit end
@@ -48,12 +47,12 @@
          if (abstractboat != null) {
 -            abstractboat.setInitialPos(d1, d2 + d4, d3);
 +            abstractboat.setInitialPos(event.getVelocity().getX(), event.getVelocity().getY(), event.getVelocity().getZ()); // CraftBukkit
-             EntityTypes.createDefaultStackConfig(worldserver, itemstack, (EntityHuman) null).accept(abstractboat);
+             EntityType.createDefaultStackConfig(worldserver, stack, (Player) null).accept(abstractboat);
              abstractboat.setYRot(enumdirection.toYRot());
 -            worldserver.addFreshEntity(abstractboat);
--            itemstack.shrink(1);
-+            if (!worldserver.addFreshEntity(abstractboat)) itemstack.grow(1); // CraftBukkit
+-            stack.shrink(1);
++            if (!worldserver.addFreshEntity(abstractboat)) stack.grow(1); // CraftBukkit
 +            // itemstack.shrink(1); // CraftBukkit - handled during event processing
          }
  
-         return itemstack;
+         return stack;

paper-server/patches/sources/net/minecraft/core/dispenser/DefaultDispenseItemBehavior.java.patch

@@ -0,0 +1,113 @@
+--- a/net/minecraft/core/dispenser/DefaultDispenseItemBehavior.java
++++ b/net/minecraft/core/dispenser/DefaultDispenseItemBehavior.java
+@@ -6,11 +6,25 @@
+ import net.minecraft.world.item.ItemStack;
+ import net.minecraft.world.level.Level;
+ import net.minecraft.world.level.block.DispenserBlock;
++// CraftBukkit start
++import org.bukkit.craftbukkit.block.CraftBlock;
++import org.bukkit.craftbukkit.inventory.CraftItemStack;
++import org.bukkit.craftbukkit.util.CraftVector;
++import org.bukkit.event.block.BlockDispenseEvent;
++// CraftBukkit end
+ 
+ public class DefaultDispenseItemBehavior implements DispenseItemBehavior {
+ 
+     private static final int DEFAULT_ACCURACY = 6;
+ 
++    // CraftBukkit start
++    private boolean dropper;
++
++    public DefaultDispenseItemBehavior(boolean dropper) {
++        this.dropper = dropper;
++    }
++    // CraftBukkit end
++
+     public DefaultDispenseItemBehavior() {}
+ 
+     @Override
+@@ -27,26 +41,77 @@
+         Position iposition = DispenserBlock.getDispensePosition(pointer);
+         ItemStack itemstack1 = stack.split(1);
+ 
+-        DefaultDispenseItemBehavior.spawnItem(pointer.level(), itemstack1, 6, enumdirection, iposition);
++        // CraftBukkit start
++        if (!DefaultDispenseItemBehavior.spawnItem(pointer.level(), itemstack1, 6, enumdirection, pointer, this.dropper)) {
++            stack.grow(1);
++        }
++        // CraftBukkit end
+         return stack;
+     }
+ 
+     public static void spawnItem(Level world, ItemStack stack, int speed, Direction side, Position pos) {
+-        double d0 = pos.x();
+-        double d1 = pos.y();
+-        double d2 = pos.z();
++        // CraftBukkit start
++        ItemEntity entityitem = DefaultDispenseItemBehavior.prepareItem(world, stack, speed, side, pos);
++        world.addFreshEntity(entityitem);
++    }
+ 
+-        if (side.getAxis() == Direction.Axis.Y) {
++    private static ItemEntity prepareItem(Level world, ItemStack itemstack, int i, Direction enumdirection, Position iposition) {
++        // CraftBukkit end
++        double d0 = iposition.x();
++        double d1 = iposition.y();
++        double d2 = iposition.z();
++
++        if (enumdirection.getAxis() == Direction.Axis.Y) {
+             d1 -= 0.125D;
+         } else {
+             d1 -= 0.15625D;
+         }
+ 
+-        ItemEntity entityitem = new ItemEntity(world, d0, d1, d2, stack);
++        ItemEntity entityitem = new ItemEntity(world, d0, d1, d2, itemstack);
+         double d3 = world.random.nextDouble() * 0.1D + 0.2D;
+ 
+-        entityitem.setDeltaMovement(world.random.triangle((double) side.getStepX() * d3, 0.0172275D * (double) speed), world.random.triangle(0.2D, 0.0172275D * (double) speed), world.random.triangle((double) side.getStepZ() * d3, 0.0172275D * (double) speed));
++        entityitem.setDeltaMovement(world.random.triangle((double) enumdirection.getStepX() * d3, 0.0172275D * (double) i), world.random.triangle(0.2D, 0.0172275D * (double) i), world.random.triangle((double) enumdirection.getStepZ() * d3, 0.0172275D * (double) i));
++        // CraftBukkit start
++        return entityitem;
++    }
++
++    // CraftBukkit - void -> boolean return, IPosition -> ISourceBlock last argument, dropper
++    public static boolean spawnItem(Level world, ItemStack itemstack, int i, Direction enumdirection, BlockSource sourceblock, boolean dropper) {
++        if (itemstack.isEmpty()) return true;
++        Position iposition = DispenserBlock.getDispensePosition(sourceblock);
++        ItemEntity entityitem = DefaultDispenseItemBehavior.prepareItem(world, itemstack, i, enumdirection, iposition);
++
++        org.bukkit.block.Block block = CraftBlock.at(world, sourceblock.pos());
++        CraftItemStack craftItem = CraftItemStack.asCraftMirror(itemstack);
++
++        BlockDispenseEvent event = new BlockDispenseEvent(block, craftItem.clone(), CraftVector.toBukkit(entityitem.getDeltaMovement()));
++        if (!DispenserBlock.eventFired) {
++            world.getCraftServer().getPluginManager().callEvent(event);
++        }
++
++        if (event.isCancelled()) {
++            return false;
++        }
++
++        entityitem.setItem(CraftItemStack.asNMSCopy(event.getItem()));
++        entityitem.setDeltaMovement(CraftVector.toNMS(event.getVelocity()));
++
++        if (!dropper && !event.getItem().getType().equals(craftItem.getType())) {
++            // Chain to handler for new item
++            ItemStack eventStack = CraftItemStack.asNMSCopy(event.getItem());
++            DispenseItemBehavior idispensebehavior = (DispenseItemBehavior) DispenserBlock.DISPENSER_REGISTRY.get(eventStack.getItem());
++            if (idispensebehavior != DispenseItemBehavior.NOOP && idispensebehavior.getClass() != DefaultDispenseItemBehavior.class) {
++                idispensebehavior.dispense(sourceblock, eventStack);
++            } else {
++                world.addFreshEntity(entityitem);
++            }
++            return false;
++        }
++
+         world.addFreshEntity(entityitem);
++
++        return true;
++        // CraftBukkit end
+     }
+ 
+     protected void playSound(BlockSource pointer) {

paper-server/patches/sources/net/minecraft/core/dispenser/DispenseBehaviorItem.patch

@@ -1,100 +0,0 @@
---- a/net/minecraft/core/dispenser/DispenseBehaviorItem.java
-+++ b/net/minecraft/core/dispenser/DispenseBehaviorItem.java
-@@ -7,10 +7,25 @@
- import net.minecraft.world.level.World;
- import net.minecraft.world.level.block.BlockDispenser;
- 
-+// CraftBukkit start
-+import org.bukkit.craftbukkit.block.CraftBlock;
-+import org.bukkit.craftbukkit.inventory.CraftItemStack;
-+import org.bukkit.craftbukkit.util.CraftVector;
-+import org.bukkit.event.block.BlockDispenseEvent;
-+// CraftBukkit end
-+
- public class DispenseBehaviorItem implements IDispenseBehavior {
- 
-     private static final int DEFAULT_ACCURACY = 6;
- 
-+    // CraftBukkit start
-+    private boolean dropper;
-+
-+    public DispenseBehaviorItem(boolean dropper) {
-+        this.dropper = dropper;
-+    }
-+    // CraftBukkit end
-+
-     public DispenseBehaviorItem() {}
- 
-     @Override
-@@ -27,11 +42,22 @@
-         IPosition iposition = BlockDispenser.getDispensePosition(sourceblock);
-         ItemStack itemstack1 = itemstack.split(1);
- 
--        spawnItem(sourceblock.level(), itemstack1, 6, enumdirection, iposition);
-+        // CraftBukkit start
-+        if (!spawnItem(sourceblock.level(), itemstack1, 6, enumdirection, sourceblock, dropper)) {
-+            itemstack.grow(1);
-+        }
-+        // CraftBukkit end
-         return itemstack;
-     }
- 
-     public static void spawnItem(World world, ItemStack itemstack, int i, EnumDirection enumdirection, IPosition iposition) {
-+        // CraftBukkit start
-+        EntityItem entityitem = prepareItem(world, itemstack, i, enumdirection, iposition);
-+        world.addFreshEntity(entityitem);
-+    }
-+
-+    private static EntityItem prepareItem(World world, ItemStack itemstack, int i, EnumDirection enumdirection, IPosition iposition) {
-+        // CraftBukkit end
-         double d0 = iposition.x();
-         double d1 = iposition.y();
-         double d2 = iposition.z();
-@@ -46,7 +72,47 @@
-         double d3 = world.random.nextDouble() * 0.1D + 0.2D;
- 
-         entityitem.setDeltaMovement(world.random.triangle((double) enumdirection.getStepX() * d3, 0.0172275D * (double) i), world.random.triangle(0.2D, 0.0172275D * (double) i), world.random.triangle((double) enumdirection.getStepZ() * d3, 0.0172275D * (double) i));
-+        // CraftBukkit start
-+        return entityitem;
-+    }
-+
-+    // CraftBukkit - void -> boolean return, IPosition -> ISourceBlock last argument, dropper
-+    public static boolean spawnItem(World world, ItemStack itemstack, int i, EnumDirection enumdirection, SourceBlock sourceblock, boolean dropper) {
-+        if (itemstack.isEmpty()) return true;
-+        IPosition iposition = BlockDispenser.getDispensePosition(sourceblock);
-+        EntityItem entityitem = prepareItem(world, itemstack, i, enumdirection, iposition);
-+
-+        org.bukkit.block.Block block = CraftBlock.at(world, sourceblock.pos());
-+        CraftItemStack craftItem = CraftItemStack.asCraftMirror(itemstack);
-+
-+        BlockDispenseEvent event = new BlockDispenseEvent(block, craftItem.clone(), CraftVector.toBukkit(entityitem.getDeltaMovement()));
-+        if (!BlockDispenser.eventFired) {
-+            world.getCraftServer().getPluginManager().callEvent(event);
-+        }
-+
-+        if (event.isCancelled()) {
-+            return false;
-+        }
-+
-+        entityitem.setItem(CraftItemStack.asNMSCopy(event.getItem()));
-+        entityitem.setDeltaMovement(CraftVector.toNMS(event.getVelocity()));
-+
-+        if (!dropper && !event.getItem().getType().equals(craftItem.getType())) {
-+            // Chain to handler for new item
-+            ItemStack eventStack = CraftItemStack.asNMSCopy(event.getItem());
-+            IDispenseBehavior idispensebehavior = (IDispenseBehavior) BlockDispenser.DISPENSER_REGISTRY.get(eventStack.getItem());
-+            if (idispensebehavior != IDispenseBehavior.NOOP && idispensebehavior.getClass() != DispenseBehaviorItem.class) {
-+                idispensebehavior.dispense(sourceblock, eventStack);
-+            } else {
-+                world.addFreshEntity(entityitem);
-+            }
-+            return false;
-+        }
-+
-         world.addFreshEntity(entityitem);
-+
-+        return true;
-+        // CraftBukkit end
-     }
- 
-     protected void playSound(SourceBlock sourceblock) {

paper-server/patches/sources/net/minecraft/core/dispenser/DispenseBehaviorProjectile.patch

@@ -1,58 +0,0 @@
---- a/net/minecraft/core/dispenser/DispenseBehaviorProjectile.java
-+++ b/net/minecraft/core/dispenser/DispenseBehaviorProjectile.java
-@@ -9,6 +9,12 @@
- import net.minecraft.world.item.ProjectileItem;
- import net.minecraft.world.level.block.BlockDispenser;
- 
-+// CraftBukkit start
-+import org.bukkit.craftbukkit.block.CraftBlock;
-+import org.bukkit.craftbukkit.inventory.CraftItemStack;
-+import org.bukkit.event.block.BlockDispenseEvent;
-+// CraftBukkit end
-+
- public class DispenseBehaviorProjectile extends DispenseBehaviorItem {
- 
-     private final ProjectileItem projectileItem;
-@@ -31,8 +37,40 @@
-         EnumDirection enumdirection = (EnumDirection) sourceblock.state().getValue(BlockDispenser.FACING);
-         IPosition iposition = this.dispenseConfig.positionFunction().getDispensePosition(sourceblock, enumdirection);
- 
--        IProjectile.spawnProjectileUsingShoot(this.projectileItem.asProjectile(worldserver, iposition, itemstack, enumdirection), worldserver, itemstack, (double) enumdirection.getStepX(), (double) enumdirection.getStepY(), (double) enumdirection.getStepZ(), this.dispenseConfig.power(), this.dispenseConfig.uncertainty());
--        itemstack.shrink(1);
-+        // CraftBukkit start
-+        // IProjectile.spawnProjectileUsingShoot(this.projectileItem.asProjectile(worldserver, iposition, itemstack, enumdirection), worldserver, itemstack, (double) enumdirection.getStepX(), (double) enumdirection.getStepY(), (double) enumdirection.getStepZ(), this.dispenseConfig.power(), this.dispenseConfig.uncertainty()); // CraftBukkit - call when finish the BlockDispenseEvent
-+        ItemStack itemstack1 = itemstack.split(1);
-+        org.bukkit.block.Block block = CraftBlock.at(worldserver, sourceblock.pos());
-+        CraftItemStack craftItem = CraftItemStack.asCraftMirror(itemstack1);
-+
-+        BlockDispenseEvent event = new BlockDispenseEvent(block, craftItem.clone(), new org.bukkit.util.Vector((double) enumdirection.getStepX(), (double) enumdirection.getStepY(), (double) enumdirection.getStepZ()));
-+        if (!BlockDispenser.eventFired) {
-+            worldserver.getCraftServer().getPluginManager().callEvent(event);
-+        }
-+
-+        if (event.isCancelled()) {
-+            itemstack.grow(1);
-+            return itemstack;
-+        }
-+
-+        if (!event.getItem().equals(craftItem)) {
-+            itemstack.grow(1);
-+            // Chain to handler for new item
-+            ItemStack eventStack = CraftItemStack.asNMSCopy(event.getItem());
-+            IDispenseBehavior idispensebehavior = (IDispenseBehavior) BlockDispenser.DISPENSER_REGISTRY.get(eventStack.getItem());
-+            if (idispensebehavior != IDispenseBehavior.NOOP && idispensebehavior != this) {
-+                idispensebehavior.dispense(sourceblock, eventStack);
-+                return itemstack;
-+            }
-+        }
-+
-+        // SPIGOT-7923: Avoid create projectiles with empty item
-+        if (!itemstack1.isEmpty()) {
-+            IProjectile iprojectile = IProjectile.spawnProjectileUsingShoot(this.projectileItem.asProjectile(worldserver, iposition, itemstack1, enumdirection), worldserver, itemstack1, event.getVelocity().getX(), event.getVelocity().getY(), event.getVelocity().getZ(), this.dispenseConfig.power(), this.dispenseConfig.uncertainty());
-+            iprojectile.projectileSource = new org.bukkit.craftbukkit.projectiles.CraftBlockProjectileSource(sourceblock.blockEntity());
-+        }
-+        // itemstack.shrink(1); // CraftBukkit - Handled during event processing
-+        // CraftBukkit end
-         return itemstack;
-     }
- 

paper-server/patches/sources/net/minecraft/core/dispenser/DispenseBehaviorShears.patch

@@ -1,73 +0,0 @@
---- a/net/minecraft/core/dispenser/DispenseBehaviorShears.java
-+++ b/net/minecraft/core/dispenser/DispenseBehaviorShears.java
-@@ -23,6 +23,13 @@
- import net.minecraft.world.level.gameevent.GameEvent;
- import net.minecraft.world.phys.AxisAlignedBB;
- 
-+// CraftBukkit start
-+import org.bukkit.craftbukkit.block.CraftBlock;
-+import org.bukkit.craftbukkit.event.CraftEventFactory;
-+import org.bukkit.craftbukkit.inventory.CraftItemStack;
-+import org.bukkit.event.block.BlockDispenseEvent;
-+// CraftBukkit end
-+
- public class DispenseBehaviorShears extends DispenseBehaviorMaybe {
- 
-     public DispenseBehaviorShears() {}
-@@ -30,11 +37,34 @@
-     @Override
-     protected ItemStack execute(SourceBlock sourceblock, ItemStack itemstack) {
-         WorldServer worldserver = sourceblock.level();
-+        // CraftBukkit start
-+        org.bukkit.block.Block bukkitBlock = CraftBlock.at(worldserver, sourceblock.pos());
-+        CraftItemStack craftItem = CraftItemStack.asCraftMirror(itemstack);
-+
-+        BlockDispenseEvent event = new BlockDispenseEvent(bukkitBlock, craftItem.clone(), new org.bukkit.util.Vector(0, 0, 0));
-+        if (!BlockDispenser.eventFired) {
-+            worldserver.getCraftServer().getPluginManager().callEvent(event);
-+        }
-+
-+        if (event.isCancelled()) {
-+            return itemstack;
-+        }
-+
-+        if (!event.getItem().equals(craftItem)) {
-+            // Chain to handler for new item
-+            ItemStack eventStack = CraftItemStack.asNMSCopy(event.getItem());
-+            IDispenseBehavior idispensebehavior = (IDispenseBehavior) BlockDispenser.DISPENSER_REGISTRY.get(eventStack.getItem());
-+            if (idispensebehavior != IDispenseBehavior.NOOP && idispensebehavior != this) {
-+                idispensebehavior.dispense(sourceblock, eventStack);
-+                return itemstack;
-+            }
-+        }
-+        // CraftBukkit end
- 
-         if (!worldserver.isClientSide()) {
-             BlockPosition blockposition = sourceblock.pos().relative((EnumDirection) sourceblock.state().getValue(BlockDispenser.FACING));
- 
--            this.setSuccess(tryShearBeehive(worldserver, blockposition) || tryShearLivingEntity(worldserver, blockposition, itemstack));
-+            this.setSuccess(tryShearBeehive(worldserver, blockposition) || tryShearLivingEntity(worldserver, blockposition, itemstack, bukkitBlock, craftItem)); // CraftBukkit
-             if (this.isSuccess()) {
-                 itemstack.hurtAndBreak(1, worldserver, (EntityPlayer) null, (item) -> {
-                 });
-@@ -64,7 +94,7 @@
-         return false;
-     }
- 
--    private static boolean tryShearLivingEntity(WorldServer worldserver, BlockPosition blockposition, ItemStack itemstack) {
-+    private static boolean tryShearLivingEntity(WorldServer worldserver, BlockPosition blockposition, ItemStack itemstack, org.bukkit.block.Block bukkitBlock, CraftItemStack craftItem) { // CraftBukkit - add args
-         List<EntityLiving> list = worldserver.getEntitiesOfClass(EntityLiving.class, new AxisAlignedBB(blockposition), IEntitySelector.NO_SPECTATORS);
-         Iterator iterator = list.iterator();
- 
-@@ -73,6 +103,11 @@
- 
-             if (entityliving instanceof IShearable ishearable) {
-                 if (ishearable.readyForShearing()) {
-+                    // CraftBukkit start
-+                    if (CraftEventFactory.callBlockShearEntityEvent(entityliving, bukkitBlock, craftItem).isCancelled()) {
-+                        continue;
-+                    }
-+                    // CraftBukkit end
-                     ishearable.shear(worldserver, SoundCategory.BLOCKS, itemstack);
-                     worldserver.gameEvent((Entity) null, (Holder) GameEvent.SHEAR, blockposition);
-                     return true;

paper-server/patches/sources/net/minecraft/core/dispenser/DispenseBehaviorShulkerBox.patch

@@ -1,46 +0,0 @@
---- a/net/minecraft/core/dispenser/DispenseBehaviorShulkerBox.java
-+++ b/net/minecraft/core/dispenser/DispenseBehaviorShulkerBox.java
-@@ -10,6 +10,12 @@
- import net.minecraft.world.level.block.BlockDispenser;
- import org.slf4j.Logger;
- 
-+// CraftBukkit start
-+import org.bukkit.craftbukkit.block.CraftBlock;
-+import org.bukkit.craftbukkit.inventory.CraftItemStack;
-+import org.bukkit.event.block.BlockDispenseEvent;
-+// CraftBukkit end
-+
- public class DispenseBehaviorShulkerBox extends DispenseBehaviorMaybe {
- 
-     private static final Logger LOGGER = LogUtils.getLogger();
-@@ -26,6 +32,30 @@
-             BlockPosition blockposition = sourceblock.pos().relative(enumdirection);
-             EnumDirection enumdirection1 = sourceblock.level().isEmptyBlock(blockposition.below()) ? enumdirection : EnumDirection.UP;
- 
-+            // CraftBukkit start
-+            org.bukkit.block.Block bukkitBlock = CraftBlock.at(sourceblock.level(), sourceblock.pos());
-+            CraftItemStack craftItem = CraftItemStack.asCraftMirror(itemstack);
-+
-+            BlockDispenseEvent event = new BlockDispenseEvent(bukkitBlock, craftItem.clone(), new org.bukkit.util.Vector(blockposition.getX(), blockposition.getY(), blockposition.getZ()));
-+            if (!BlockDispenser.eventFired) {
-+                sourceblock.level().getCraftServer().getPluginManager().callEvent(event);
-+            }
-+
-+            if (event.isCancelled()) {
-+                return itemstack;
-+            }
-+
-+            if (!event.getItem().equals(craftItem)) {
-+                // Chain to handler for new item
-+                ItemStack eventStack = CraftItemStack.asNMSCopy(event.getItem());
-+                IDispenseBehavior idispensebehavior = (IDispenseBehavior) BlockDispenser.DISPENSER_REGISTRY.get(eventStack.getItem());
-+                if (idispensebehavior != IDispenseBehavior.NOOP && idispensebehavior != this) {
-+                    idispensebehavior.dispense(sourceblock, eventStack);
-+                    return itemstack;
-+                }
-+            }
-+            // CraftBukkit end
-+
-             try {
-                 this.setSuccess(((ItemBlock) item).place(new BlockActionContextDirectional(sourceblock.level(), blockposition, enumdirection, itemstack, enumdirection1)).consumesAction());
-             } catch (Exception exception) {

paper-server/patches/sources/net/minecraft/core/dispenser/DispenseItemBehavior.java.patch

@@ -1,13 +1,27 @@
---- a/net/minecraft/core/dispenser/IDispenseBehavior.java
-+++ b/net/minecraft/core/dispenser/IDispenseBehavior.java
-@@ -63,6 +63,22 @@
- import net.minecraft.world.phys.MovingObjectPositionBlock;
+--- a/net/minecraft/core/dispenser/DispenseItemBehavior.java
++++ b/net/minecraft/core/dispenser/DispenseItemBehavior.java
+@@ -28,6 +28,7 @@
+ import net.minecraft.world.entity.item.PrimedTnt;
+ import net.minecraft.world.entity.player.Player;
+ import net.minecraft.world.item.BoneMealItem;
++import net.minecraft.world.item.BucketItem;
+ import net.minecraft.world.item.DispensibleContainerItem;
+ import net.minecraft.world.item.DyeColor;
+ import net.minecraft.world.item.HoneycombItem;
+@@ -47,7 +48,9 @@
+ import net.minecraft.world.level.block.CandleCakeBlock;
+ import net.minecraft.world.level.block.CarvedPumpkinBlock;
+ import net.minecraft.world.level.block.DispenserBlock;
++import net.minecraft.world.level.block.LiquidBlockContainer;
+ import net.minecraft.world.level.block.RespawnAnchorBlock;
++import net.minecraft.world.level.block.SaplingBlock;
+ import net.minecraft.world.level.block.ShulkerBoxBlock;
+ import net.minecraft.world.level.block.SkullBlock;
+ import net.minecraft.world.level.block.TntBlock;
+@@ -62,6 +65,17 @@
+ import net.minecraft.world.phys.AABB;
+ import net.minecraft.world.phys.BlockHitResult;
  import org.slf4j.Logger;
- 
-+// CraftBukkit start
-+import net.minecraft.world.item.ItemBucket;
-+import net.minecraft.world.level.block.BlockSapling;
-+import net.minecraft.world.level.block.IFluidContainer;
 +import org.bukkit.Location;
 +import org.bukkit.TreeType;
 +import org.bukkit.craftbukkit.block.CraftBlock;
@@ -19,163 +33,162 @@
 +import org.bukkit.event.block.BlockFertilizeEvent;
 +import org.bukkit.event.world.StructureGrowEvent;
 +// CraftBukkit end
-+
- public interface IDispenseBehavior {
  
-     Logger LOGGER = LogUtils.getLogger();
-@@ -90,14 +106,42 @@
-                 EnumDirection enumdirection = (EnumDirection) sourceblock.state().getValue(BlockDispenser.FACING);
-                 EntityTypes<?> entitytypes = ((ItemMonsterEgg) itemstack.getItem()).getType(sourceblock.level().registryAccess(), itemstack);
+ public interface DispenseItemBehavior {
+ 
+@@ -90,14 +104,42 @@
+                 Direction enumdirection = (Direction) pointer.state().getValue(DispenserBlock.FACING);
+                 EntityType<?> entitytypes = ((SpawnEggItem) stack.getItem()).getType(pointer.level().registryAccess(), stack);
  
 +                // CraftBukkit start
-+                WorldServer worldserver = sourceblock.level();
-+                ItemStack itemstack1 = itemstack.split(1);
-+                org.bukkit.block.Block block = CraftBlock.at(worldserver, sourceblock.pos());
++                ServerLevel worldserver = pointer.level();
++                ItemStack itemstack1 = stack.split(1);
++                org.bukkit.block.Block block = CraftBlock.at(worldserver, pointer.pos());
 +                CraftItemStack craftItem = CraftItemStack.asCraftMirror(itemstack1);
 +
 +                BlockDispenseEvent event = new BlockDispenseEvent(block, craftItem.clone(), new org.bukkit.util.Vector(0, 0, 0));
-+                if (!BlockDispenser.eventFired) {
++                if (!DispenserBlock.eventFired) {
 +                    worldserver.getCraftServer().getPluginManager().callEvent(event);
 +                }
 +
 +                if (event.isCancelled()) {
-+                    itemstack.grow(1);
-+                    return itemstack;
++                    stack.grow(1);
++                    return stack;
 +                }
 +
 +                if (!event.getItem().equals(craftItem)) {
-+                    itemstack.grow(1);
++                    stack.grow(1);
 +                    // Chain to handler for new item
 +                    ItemStack eventStack = CraftItemStack.asNMSCopy(event.getItem());
-+                    IDispenseBehavior idispensebehavior = (IDispenseBehavior) BlockDispenser.DISPENSER_REGISTRY.get(eventStack.getItem());
-+                    if (idispensebehavior != IDispenseBehavior.NOOP && idispensebehavior != this) {
-+                        idispensebehavior.dispense(sourceblock, eventStack);
-+                        return itemstack;
++                    DispenseItemBehavior idispensebehavior = (DispenseItemBehavior) DispenserBlock.DISPENSER_REGISTRY.get(eventStack.getItem());
++                    if (idispensebehavior != DispenseItemBehavior.NOOP && idispensebehavior != this) {
++                        idispensebehavior.dispense(pointer, eventStack);
++                        return stack;
 +                    }
 +                }
 +
                  try {
-                     entitytypes.spawn(sourceblock.level(), itemstack, (EntityHuman) null, sourceblock.pos().relative(enumdirection), EntitySpawnReason.DISPENSER, enumdirection != EnumDirection.UP, false);
+                     entitytypes.spawn(pointer.level(), stack, (Player) null, pointer.pos().relative(enumdirection), EntitySpawnReason.DISPENSER, enumdirection != Direction.UP, false);
                  } catch (Exception exception) {
--                    null.LOGGER.error("Error while dispensing spawn egg from dispenser at {}", sourceblock.pos(), exception);
-+                    LOGGER.error("Error while dispensing spawn egg from dispenser at {}", sourceblock.pos(), exception); // CraftBukkit - decompile error
+-                    null.LOGGER.error("Error while dispensing spawn egg from dispenser at {}", pointer.pos(), exception);
++                    DispenseItemBehavior.LOGGER.error("Error while dispensing spawn egg from dispenser at {}", pointer.pos(), exception); // CraftBukkit - decompile error
                      return ItemStack.EMPTY;
                  }
  
--                itemstack.shrink(1);
+-                stack.shrink(1);
 +                // itemstack.shrink(1); // Handled during event processing
 +                // CraftBukkit end
-                 sourceblock.level().gameEvent((Entity) null, (Holder) GameEvent.ENTITY_PLACE, sourceblock.pos());
-                 return itemstack;
+                 pointer.level().gameEvent((Entity) null, (Holder) GameEvent.ENTITY_PLACE, pointer.pos());
+                 return stack;
              }
-@@ -116,13 +160,41 @@
-                 EnumDirection enumdirection = (EnumDirection) sourceblock.state().getValue(BlockDispenser.FACING);
-                 BlockPosition blockposition = sourceblock.pos().relative(enumdirection);
-                 WorldServer worldserver = sourceblock.level();
+@@ -116,13 +158,41 @@
+                 Direction enumdirection = (Direction) pointer.state().getValue(DispenserBlock.FACING);
+                 BlockPos blockposition = pointer.pos().relative(enumdirection);
+                 ServerLevel worldserver = pointer.level();
 +
 +                // CraftBukkit start
-+                ItemStack itemstack1 = itemstack.split(1);
-+                org.bukkit.block.Block block = CraftBlock.at(worldserver, sourceblock.pos());
++                ItemStack itemstack1 = stack.split(1);
++                org.bukkit.block.Block block = CraftBlock.at(worldserver, pointer.pos());
 +                CraftItemStack craftItem = CraftItemStack.asCraftMirror(itemstack1);
 +
 +                BlockDispenseEvent event = new BlockDispenseEvent(block, craftItem.clone(), new org.bukkit.util.Vector(0, 0, 0));
-+                if (!BlockDispenser.eventFired) {
++                if (!DispenserBlock.eventFired) {
 +                    worldserver.getCraftServer().getPluginManager().callEvent(event);
 +                }
 +
 +                if (event.isCancelled()) {
-+                    itemstack.grow(1);
-+                    return itemstack;
++                    stack.grow(1);
++                    return stack;
 +                }
 +
 +                if (!event.getItem().equals(craftItem)) {
-+                    itemstack.grow(1);
++                    stack.grow(1);
 +                    // Chain to handler for new item
 +                    ItemStack eventStack = CraftItemStack.asNMSCopy(event.getItem());
-+                    IDispenseBehavior idispensebehavior = (IDispenseBehavior) BlockDispenser.DISPENSER_REGISTRY.get(eventStack.getItem());
-+                    if (idispensebehavior != IDispenseBehavior.NOOP && idispensebehavior != this) {
-+                        idispensebehavior.dispense(sourceblock, eventStack);
-+                        return itemstack;
++                    DispenseItemBehavior idispensebehavior = (DispenseItemBehavior) DispenserBlock.DISPENSER_REGISTRY.get(eventStack.getItem());
++                    if (idispensebehavior != DispenseItemBehavior.NOOP && idispensebehavior != this) {
++                        idispensebehavior.dispense(pointer, eventStack);
++                        return stack;
 +                    }
 +                }
 +                // CraftBukkit end
 +
-                 Consumer<EntityArmorStand> consumer = EntityTypes.appendDefaultStackConfig((entityarmorstand) -> {
+                 Consumer<ArmorStand> consumer = EntityType.appendDefaultStackConfig((entityarmorstand) -> {
                      entityarmorstand.setYRot(enumdirection.toYRot());
-                 }, worldserver, itemstack, (EntityHuman) null);
-                 EntityArmorStand entityarmorstand = (EntityArmorStand) EntityTypes.ARMOR_STAND.spawn(worldserver, consumer, blockposition, EntitySpawnReason.DISPENSER, false, false);
+                 }, worldserver, stack, (Player) null);
+                 ArmorStand entityarmorstand = (ArmorStand) EntityType.ARMOR_STAND.spawn(worldserver, consumer, blockposition, EntitySpawnReason.DISPENSER, false, false);
  
                  if (entityarmorstand != null) {
--                    itemstack.shrink(1);
+-                    stack.shrink(1);
 +                    // itemstack.shrink(1); // CraftBukkit - Handled during event processing
                  }
  
-                 return itemstack;
-@@ -141,7 +213,34 @@
+                 return stack;
+@@ -141,7 +211,34 @@
                  });
  
                  if (!list.isEmpty()) {
--                    ((ISaddleable) list.get(0)).equipSaddle(itemstack.split(1), SoundCategory.BLOCKS);
+-                    ((Saddleable) list.get(0)).equipSaddle(stack.split(1), SoundSource.BLOCKS);
 +                    // CraftBukkit start
-+                    ItemStack itemstack1 = itemstack.split(1);
-+                    WorldServer world = sourceblock.level();
-+                    org.bukkit.block.Block block = CraftBlock.at(world, sourceblock.pos());
++                    ItemStack itemstack1 = stack.split(1);
++                    ServerLevel world = pointer.level();
++                    org.bukkit.block.Block block = CraftBlock.at(world, pointer.pos());
 +                    CraftItemStack craftItem = CraftItemStack.asCraftMirror(itemstack1);
 +
 +                    BlockDispenseArmorEvent event = new BlockDispenseArmorEvent(block, craftItem.clone(), (org.bukkit.craftbukkit.entity.CraftLivingEntity) list.get(0).getBukkitEntity());
-+                    if (!BlockDispenser.eventFired) {
++                    if (!DispenserBlock.eventFired) {
 +                        world.getCraftServer().getPluginManager().callEvent(event);
 +                    }
 +
 +                    if (event.isCancelled()) {
-+                        itemstack.grow(1);
-+                        return itemstack;
++                        stack.grow(1);
++                        return stack;
 +                    }
 +
 +                    if (!event.getItem().equals(craftItem)) {
-+                        itemstack.grow(1);
++                        stack.grow(1);
 +                        // Chain to handler for new item
 +                        ItemStack eventStack = CraftItemStack.asNMSCopy(event.getItem());
-+                        IDispenseBehavior idispensebehavior = (IDispenseBehavior) BlockDispenser.DISPENSER_REGISTRY.get(eventStack.getItem());
-+                        if (idispensebehavior != IDispenseBehavior.NOOP && idispensebehavior != EquipmentDispenseItemBehavior.INSTANCE) {
-+                            idispensebehavior.dispense(sourceblock, eventStack);
-+                            return itemstack;
++                        DispenseItemBehavior idispensebehavior = (DispenseItemBehavior) DispenserBlock.DISPENSER_REGISTRY.get(eventStack.getItem());
++                        if (idispensebehavior != DispenseItemBehavior.NOOP && idispensebehavior != EquipmentDispenseItemBehavior.INSTANCE) {
++                            idispensebehavior.dispense(pointer, eventStack);
++                            return stack;
 +                        }
 +                    }
-+                    ((ISaddleable) list.get(0)).equipSaddle(itemstack1, SoundCategory.BLOCKS);
++                    ((Saddleable) list.get(0)).equipSaddle(itemstack1, SoundSource.BLOCKS);
 +                    // CraftBukkit end
                      this.setSuccess(true);
-                     return itemstack;
+                     return stack;
                  } else {
-@@ -166,9 +265,35 @@
+@@ -166,9 +263,35 @@
                      }
  
-                     entityhorsechestedabstract = (EntityHorseChestedAbstract) iterator1.next();
--                } while (!entityhorsechestedabstract.isTamed() || !entityhorsechestedabstract.getSlot(499).set(itemstack));
+                     entityhorsechestedabstract = (AbstractChestedHorse) iterator1.next();
+-                } while (!entityhorsechestedabstract.isTamed() || !entityhorsechestedabstract.getSlot(499).set(stack));
 +                    // CraftBukkit start
 +                } while (!entityhorsechestedabstract.isTamed());
-+                ItemStack itemstack1 = itemstack.split(1);
-+                WorldServer world = sourceblock.level();
-+                org.bukkit.block.Block block = CraftBlock.at(world, sourceblock.pos());
++                ItemStack itemstack1 = stack.split(1);
++                ServerLevel world = pointer.level();
++                org.bukkit.block.Block block = CraftBlock.at(world, pointer.pos());
 +                CraftItemStack craftItem = CraftItemStack.asCraftMirror(itemstack1);
  
--                itemstack.shrink(1);
+-                stack.shrink(1);
 +                BlockDispenseArmorEvent event = new BlockDispenseArmorEvent(block, craftItem.clone(), (org.bukkit.craftbukkit.entity.CraftLivingEntity) entityhorsechestedabstract.getBukkitEntity());
-+                if (!BlockDispenser.eventFired) {
++                if (!DispenserBlock.eventFired) {
 +                    world.getCraftServer().getPluginManager().callEvent(event);
 +                }
 +
 +                if (event.isCancelled()) {
-+                    return itemstack;
++                    return stack;
 +                }
 +
 +                if (!event.getItem().equals(craftItem)) {
 +                    // Chain to handler for new item
 +                    ItemStack eventStack = CraftItemStack.asNMSCopy(event.getItem());
-+                    IDispenseBehavior idispensebehavior = (IDispenseBehavior) BlockDispenser.DISPENSER_REGISTRY.get(eventStack.getItem());
-+                    if (idispensebehavior != IDispenseBehavior.NOOP && idispensebehavior != EquipmentDispenseItemBehavior.INSTANCE) {
-+                        idispensebehavior.dispense(sourceblock, eventStack);
-+                        return itemstack;
++                    DispenseItemBehavior idispensebehavior = (DispenseItemBehavior) DispenserBlock.DISPENSER_REGISTRY.get(eventStack.getItem());
++                    if (idispensebehavior != DispenseItemBehavior.NOOP && idispensebehavior != EquipmentDispenseItemBehavior.INSTANCE) {
++                        idispensebehavior.dispense(pointer, eventStack);
++                        return stack;
 +                    }
 +                }
 +                entityhorsechestedabstract.getSlot(499).set(CraftItemStack.asNMSCopy(event.getItem()));
@@ -183,37 +196,37 @@
 +
 +                // itemstack.shrink(1); // CraftBukkit - handled above
                  this.setSuccess(true);
-                 return itemstack;
+                 return stack;
              }
-@@ -202,6 +327,38 @@
-                 BlockPosition blockposition = sourceblock.pos().relative((EnumDirection) sourceblock.state().getValue(BlockDispenser.FACING));
-                 WorldServer worldserver = sourceblock.level();
+@@ -202,6 +325,38 @@
+                 BlockPos blockposition = pointer.pos().relative((Direction) pointer.state().getValue(DispenserBlock.FACING));
+                 ServerLevel worldserver = pointer.level();
  
 +                // CraftBukkit start
 +                int x = blockposition.getX();
 +                int y = blockposition.getY();
 +                int z = blockposition.getZ();
-+                IBlockData iblockdata = worldserver.getBlockState(blockposition);
-+                if (iblockdata.isAir() || iblockdata.canBeReplaced() || (dispensiblecontaineritem instanceof ItemBucket && iblockdata.getBlock() instanceof IFluidContainer && ((IFluidContainer) iblockdata.getBlock()).canPlaceLiquid((EntityHuman) null, worldserver, blockposition, iblockdata, ((ItemBucket) dispensiblecontaineritem).content))) {
-+                    org.bukkit.block.Block block = CraftBlock.at(worldserver, sourceblock.pos());
-+                    CraftItemStack craftItem = CraftItemStack.asCraftMirror(itemstack);
++                BlockState iblockdata = worldserver.getBlockState(blockposition);
++                if (iblockdata.isAir() || iblockdata.canBeReplaced() || (dispensiblecontaineritem instanceof BucketItem && iblockdata.getBlock() instanceof LiquidBlockContainer && ((LiquidBlockContainer) iblockdata.getBlock()).canPlaceLiquid((Player) null, worldserver, blockposition, iblockdata, ((BucketItem) dispensiblecontaineritem).content))) {
++                    org.bukkit.block.Block block = CraftBlock.at(worldserver, pointer.pos());
++                    CraftItemStack craftItem = CraftItemStack.asCraftMirror(stack);
 +
 +                    BlockDispenseEvent event = new BlockDispenseEvent(block, craftItem.clone(), new org.bukkit.util.Vector(x, y, z));
-+                    if (!BlockDispenser.eventFired) {
++                    if (!DispenserBlock.eventFired) {
 +                        worldserver.getCraftServer().getPluginManager().callEvent(event);
 +                    }
 +
 +                    if (event.isCancelled()) {
-+                        return itemstack;
++                        return stack;
 +                    }
 +
 +                    if (!event.getItem().equals(craftItem)) {
 +                        // Chain to handler for new item
 +                        ItemStack eventStack = CraftItemStack.asNMSCopy(event.getItem());
-+                        IDispenseBehavior idispensebehavior = (IDispenseBehavior) BlockDispenser.DISPENSER_REGISTRY.get(eventStack.getItem());
-+                        if (idispensebehavior != IDispenseBehavior.NOOP && idispensebehavior != this) {
-+                            idispensebehavior.dispense(sourceblock, eventStack);
-+                            return itemstack;
++                        DispenseItemBehavior idispensebehavior = (DispenseItemBehavior) DispenserBlock.DISPENSER_REGISTRY.get(eventStack.getItem());
++                        if (idispensebehavior != DispenseItemBehavior.NOOP && idispensebehavior != this) {
++                            idispensebehavior.dispense(pointer, eventStack);
++                            return stack;
 +                        }
 +                    }
 +
@@ -221,130 +234,130 @@
 +                }
 +                // CraftBukkit end
 +
-                 if (dispensiblecontaineritem.emptyContents((EntityHuman) null, worldserver, blockposition, (MovingObjectPositionBlock) null)) {
-                     dispensiblecontaineritem.checkExtraContent((EntityHuman) null, worldserver, itemstack, blockposition);
-                     return this.consumeWithRemainder(sourceblock, itemstack, new ItemStack(Items.BUCKET));
-@@ -229,7 +386,7 @@
+                 if (dispensiblecontaineritem.emptyContents((Player) null, worldserver, blockposition, (BlockHitResult) null)) {
+                     dispensiblecontaineritem.checkExtraContent((Player) null, worldserver, stack, blockposition);
+                     return this.consumeWithRemainder(pointer, stack, new ItemStack(Items.BUCKET));
+@@ -229,7 +384,7 @@
                  Block block = iblockdata.getBlock();
  
-                 if (block instanceof IFluidSource ifluidsource) {
--                    ItemStack itemstack1 = ifluidsource.pickupBlock((EntityHuman) null, worldserver, blockposition, iblockdata);
-+                    ItemStack itemstack1 = ifluidsource.pickupBlock((EntityHuman) null, DummyGeneratorAccess.INSTANCE, blockposition, iblockdata); // CraftBukkit
+                 if (block instanceof BucketPickup ifluidsource) {
+-                    ItemStack itemstack1 = ifluidsource.pickupBlock((Player) null, worldserver, blockposition, iblockdata);
++                    ItemStack itemstack1 = ifluidsource.pickupBlock((Player) null, DummyGeneratorAccess.INSTANCE, blockposition, iblockdata); // CraftBukkit
  
                      if (itemstack1.isEmpty()) {
-                         return super.execute(sourceblock, itemstack);
-@@ -237,6 +394,32 @@
+                         return super.execute(pointer, stack);
+@@ -237,6 +392,32 @@
                          worldserver.gameEvent((Entity) null, (Holder) GameEvent.FLUID_PICKUP, blockposition);
                          Item item = itemstack1.getItem();
  
 +                        // CraftBukkit start
-+                        org.bukkit.block.Block bukkitBlock = CraftBlock.at(worldserver, sourceblock.pos());
-+                        CraftItemStack craftItem = CraftItemStack.asCraftMirror(itemstack);
++                        org.bukkit.block.Block bukkitBlock = CraftBlock.at(worldserver, pointer.pos());
++                        CraftItemStack craftItem = CraftItemStack.asCraftMirror(stack);
 +
 +                        BlockDispenseEvent event = new BlockDispenseEvent(bukkitBlock, craftItem.clone(), new org.bukkit.util.Vector(blockposition.getX(), blockposition.getY(), blockposition.getZ()));
-+                        if (!BlockDispenser.eventFired) {
++                        if (!DispenserBlock.eventFired) {
 +                            worldserver.getCraftServer().getPluginManager().callEvent(event);
 +                        }
 +
 +                        if (event.isCancelled()) {
-+                            return itemstack;
++                            return stack;
 +                        }
 +
 +                        if (!event.getItem().equals(craftItem)) {
 +                            // Chain to handler for new item
 +                            ItemStack eventStack = CraftItemStack.asNMSCopy(event.getItem());
-+                            IDispenseBehavior idispensebehavior = (IDispenseBehavior) BlockDispenser.DISPENSER_REGISTRY.get(eventStack.getItem());
-+                            if (idispensebehavior != IDispenseBehavior.NOOP && idispensebehavior != this) {
-+                                idispensebehavior.dispense(sourceblock, eventStack);
-+                                return itemstack;
++                            DispenseItemBehavior idispensebehavior = (DispenseItemBehavior) DispenserBlock.DISPENSER_REGISTRY.get(eventStack.getItem());
++                            if (idispensebehavior != DispenseItemBehavior.NOOP && idispensebehavior != this) {
++                                idispensebehavior.dispense(pointer, eventStack);
++                                return stack;
 +                            }
 +                        }
 +
-+                        itemstack1 = ifluidsource.pickupBlock((EntityHuman) null, worldserver, blockposition, iblockdata); // From above
++                        itemstack1 = ifluidsource.pickupBlock((Player) null, worldserver, blockposition, iblockdata); // From above
 +                        // CraftBukkit end
 +
-                         return this.consumeWithRemainder(sourceblock, itemstack, new ItemStack(item));
+                         return this.consumeWithRemainder(pointer, stack, new ItemStack(item));
                      }
                  } else {
-@@ -249,16 +432,44 @@
-             protected ItemStack execute(SourceBlock sourceblock, ItemStack itemstack) {
-                 WorldServer worldserver = sourceblock.level();
+@@ -249,16 +430,44 @@
+             protected ItemStack execute(BlockSource pointer, ItemStack stack) {
+                 ServerLevel worldserver = pointer.level();
  
 +                // CraftBukkit start
-+                org.bukkit.block.Block bukkitBlock = CraftBlock.at(worldserver, sourceblock.pos());
-+                CraftItemStack craftItem = CraftItemStack.asCraftMirror(itemstack);
++                org.bukkit.block.Block bukkitBlock = CraftBlock.at(worldserver, pointer.pos());
++                CraftItemStack craftItem = CraftItemStack.asCraftMirror(stack);
 +
 +                BlockDispenseEvent event = new BlockDispenseEvent(bukkitBlock, craftItem.clone(), new org.bukkit.util.Vector(0, 0, 0));
-+                if (!BlockDispenser.eventFired) {
++                if (!DispenserBlock.eventFired) {
 +                    worldserver.getCraftServer().getPluginManager().callEvent(event);
 +                }
 +
 +                if (event.isCancelled()) {
-+                    return itemstack;
++                    return stack;
 +                }
 +
 +                if (!event.getItem().equals(craftItem)) {
 +                    // Chain to handler for new item
 +                    ItemStack eventStack = CraftItemStack.asNMSCopy(event.getItem());
-+                    IDispenseBehavior idispensebehavior = (IDispenseBehavior) BlockDispenser.DISPENSER_REGISTRY.get(eventStack.getItem());
-+                    if (idispensebehavior != IDispenseBehavior.NOOP && idispensebehavior != this) {
-+                        idispensebehavior.dispense(sourceblock, eventStack);
-+                        return itemstack;
++                    DispenseItemBehavior idispensebehavior = (DispenseItemBehavior) DispenserBlock.DISPENSER_REGISTRY.get(eventStack.getItem());
++                    if (idispensebehavior != DispenseItemBehavior.NOOP && idispensebehavior != this) {
++                        idispensebehavior.dispense(pointer, eventStack);
++                        return stack;
 +                    }
 +                }
 +                // CraftBukkit end
 +
                  this.setSuccess(true);
-                 EnumDirection enumdirection = (EnumDirection) sourceblock.state().getValue(BlockDispenser.FACING);
-                 BlockPosition blockposition = sourceblock.pos().relative(enumdirection);
-                 IBlockData iblockdata = worldserver.getBlockState(blockposition);
+                 Direction enumdirection = (Direction) pointer.state().getValue(DispenserBlock.FACING);
+                 BlockPos blockposition = pointer.pos().relative(enumdirection);
+                 BlockState iblockdata = worldserver.getBlockState(blockposition);
  
-                 if (BlockFireAbstract.canBePlacedAt(worldserver, blockposition, enumdirection)) {
--                    worldserver.setBlockAndUpdate(blockposition, BlockFireAbstract.getState(worldserver, blockposition));
+                 if (BaseFireBlock.canBePlacedAt(worldserver, blockposition, enumdirection)) {
+-                    worldserver.setBlockAndUpdate(blockposition, BaseFireBlock.getState(worldserver, blockposition));
 -                    worldserver.gameEvent((Entity) null, (Holder) GameEvent.BLOCK_PLACE, blockposition);
 +                    // CraftBukkit start - Ignition by dispensing flint and steel
-+                    if (!org.bukkit.craftbukkit.event.CraftEventFactory.callBlockIgniteEvent(worldserver, blockposition, sourceblock.pos()).isCancelled()) {
-+                        worldserver.setBlockAndUpdate(blockposition, BlockFireAbstract.getState(worldserver, blockposition));
++                    if (!org.bukkit.craftbukkit.event.CraftEventFactory.callBlockIgniteEvent(worldserver, blockposition, pointer.pos()).isCancelled()) {
++                        worldserver.setBlockAndUpdate(blockposition, BaseFireBlock.getState(worldserver, blockposition));
 +                        worldserver.gameEvent((Entity) null, (Holder) GameEvent.BLOCK_PLACE, blockposition);
 +                    }
 +                    // CraftBukkit end
-                 } else if (!BlockCampfire.canLight(iblockdata) && !CandleBlock.canLight(iblockdata) && !CandleCakeBlock.canLight(iblockdata)) {
--                    if (iblockdata.getBlock() instanceof BlockTNT) {
-+                    if (iblockdata.getBlock() instanceof BlockTNT && org.bukkit.craftbukkit.event.CraftEventFactory.callTNTPrimeEvent(worldserver, blockposition, org.bukkit.event.block.TNTPrimeEvent.PrimeCause.DISPENSER, null, sourceblock.pos())) { // CraftBukkit - TNTPrimeEvent
-                         BlockTNT.explode(worldserver, blockposition);
+                 } else if (!CampfireBlock.canLight(iblockdata) && !CandleBlock.canLight(iblockdata) && !CandleCakeBlock.canLight(iblockdata)) {
+-                    if (iblockdata.getBlock() instanceof TntBlock) {
++                    if (iblockdata.getBlock() instanceof TntBlock && org.bukkit.craftbukkit.event.CraftEventFactory.callTNTPrimeEvent(worldserver, blockposition, org.bukkit.event.block.TNTPrimeEvent.PrimeCause.DISPENSER, null, pointer.pos())) { // CraftBukkit - TNTPrimeEvent
+                         TntBlock.explode(worldserver, blockposition);
                          worldserver.removeBlock(blockposition, false);
                      } else {
-@@ -283,12 +494,62 @@
+@@ -283,13 +492,63 @@
                  this.setSuccess(true);
-                 WorldServer worldserver = sourceblock.level();
-                 BlockPosition blockposition = sourceblock.pos().relative((EnumDirection) sourceblock.state().getValue(BlockDispenser.FACING));
+                 ServerLevel worldserver = pointer.level();
+                 BlockPos blockposition = pointer.pos().relative((Direction) pointer.state().getValue(DispenserBlock.FACING));
 +                // CraftBukkit start
-+                org.bukkit.block.Block block = CraftBlock.at(worldserver, sourceblock.pos());
-+                CraftItemStack craftItem = CraftItemStack.asCraftMirror(itemstack);
-+
++                org.bukkit.block.Block block = CraftBlock.at(worldserver, pointer.pos());
++                CraftItemStack craftItem = CraftItemStack.asCraftMirror(stack);
+ 
 +                BlockDispenseEvent event = new BlockDispenseEvent(block, craftItem.clone(), new org.bukkit.util.Vector(0, 0, 0));
-+                if (!BlockDispenser.eventFired) {
++                if (!DispenserBlock.eventFired) {
 +                    worldserver.getCraftServer().getPluginManager().callEvent(event);
 +                }
 +
 +                if (event.isCancelled()) {
-+                    return itemstack;
++                    return stack;
 +                }
 +
 +                if (!event.getItem().equals(craftItem)) {
 +                    // Chain to handler for new item
 +                    ItemStack eventStack = CraftItemStack.asNMSCopy(event.getItem());
-+                    IDispenseBehavior idispensebehavior = (IDispenseBehavior) BlockDispenser.DISPENSER_REGISTRY.get(eventStack.getItem());
-+                    if (idispensebehavior != IDispenseBehavior.NOOP && idispensebehavior != this) {
-+                        idispensebehavior.dispense(sourceblock, eventStack);
-+                        return itemstack;
++                    DispenseItemBehavior idispensebehavior = (DispenseItemBehavior) DispenserBlock.DISPENSER_REGISTRY.get(eventStack.getItem());
++                    if (idispensebehavior != DispenseItemBehavior.NOOP && idispensebehavior != this) {
++                        idispensebehavior.dispense(pointer, eventStack);
++                        return stack;
 +                    }
 +                }
 +
 +                worldserver.captureTreeGeneration = true;
 +                // CraftBukkit end
- 
-                 if (!ItemBoneMeal.growCrop(itemstack, worldserver, blockposition) && !ItemBoneMeal.growWaterPlant(itemstack, worldserver, blockposition, (EnumDirection) null)) {
++
+                 if (!BoneMealItem.growCrop(stack, worldserver, blockposition) && !BoneMealItem.growWaterPlant(stack, worldserver, blockposition, (Direction) null)) {
                      this.setSuccess(false);
                  } else if (!worldserver.isClientSide) {
                      worldserver.levelEvent(1505, blockposition, 15);
@@ -352,8 +365,8 @@
 +                // CraftBukkit start
 +                worldserver.captureTreeGeneration = false;
 +                if (worldserver.capturedBlockStates.size() > 0) {
-+                    TreeType treeType = BlockSapling.treeType;
-+                    BlockSapling.treeType = null;
++                    TreeType treeType = SaplingBlock.treeType;
++                    SaplingBlock.treeType = null;
 +                    Location location = CraftLocation.toBukkit(blockposition, worldserver.getWorld());
 +                    List<org.bukkit.block.BlockState> blocks = new java.util.ArrayList<>(worldserver.capturedBlockStates.values());
 +                    worldserver.capturedBlockStates.clear();
@@ -362,7 +375,7 @@
 +                        structureEvent = new StructureGrowEvent(location, treeType, false, null, blocks);
 +                        org.bukkit.Bukkit.getPluginManager().callEvent(structureEvent);
 +                    }
-+
+ 
 +                    BlockFertilizeEvent fertilizeEvent = new BlockFertilizeEvent(location.getBlock(), null, blocks);
 +                    fertilizeEvent.setCancelled(structureEvent != null && structureEvent.isCancelled());
 +                    org.bukkit.Bukkit.getPluginManager().callEvent(fertilizeEvent);
@@ -374,108 +387,109 @@
 +                    }
 +                }
 +                // CraftBukkit end
- 
-                 return itemstack;
++
+                 return stack;
              }
-@@ -298,12 +559,41 @@
-             protected ItemStack execute(SourceBlock sourceblock, ItemStack itemstack) {
-                 WorldServer worldserver = sourceblock.level();
-                 BlockPosition blockposition = sourceblock.pos().relative((EnumDirection) sourceblock.state().getValue(BlockDispenser.FACING));
--                EntityTNTPrimed entitytntprimed = new EntityTNTPrimed(worldserver, (double) blockposition.getX() + 0.5D, (double) blockposition.getY(), (double) blockposition.getZ() + 0.5D, (EntityLiving) null);
+         });
+@@ -298,12 +557,41 @@
+             protected ItemStack execute(BlockSource pointer, ItemStack stack) {
+                 ServerLevel worldserver = pointer.level();
+                 BlockPos blockposition = pointer.pos().relative((Direction) pointer.state().getValue(DispenserBlock.FACING));
+-                PrimedTnt entitytntprimed = new PrimedTnt(worldserver, (double) blockposition.getX() + 0.5D, (double) blockposition.getY(), (double) blockposition.getZ() + 0.5D, (LivingEntity) null);
 +                // CraftBukkit start
 +                // EntityTNTPrimed entitytntprimed = new EntityTNTPrimed(worldserver, (double) blockposition.getX() + 0.5D, (double) blockposition.getY(), (double) blockposition.getZ() + 0.5D, (EntityLiving) null);
-+
-+                ItemStack itemstack1 = itemstack.split(1);
-+                org.bukkit.block.Block block = CraftBlock.at(worldserver, sourceblock.pos());
+ 
++                ItemStack itemstack1 = stack.split(1);
++                org.bukkit.block.Block block = CraftBlock.at(worldserver, pointer.pos());
 +                CraftItemStack craftItem = CraftItemStack.asCraftMirror(itemstack1);
 +
 +                BlockDispenseEvent event = new BlockDispenseEvent(block, craftItem.clone(), new org.bukkit.util.Vector((double) blockposition.getX() + 0.5D, (double) blockposition.getY(), (double) blockposition.getZ() + 0.5D));
-+                if (!BlockDispenser.eventFired) {
++                if (!DispenserBlock.eventFired) {
 +                   worldserver.getCraftServer().getPluginManager().callEvent(event);
 +                }
 +
 +                if (event.isCancelled()) {
-+                    itemstack.grow(1);
-+                    return itemstack;
++                    stack.grow(1);
++                    return stack;
 +                }
 +
 +                if (!event.getItem().equals(craftItem)) {
-+                    itemstack.grow(1);
++                    stack.grow(1);
 +                    // Chain to handler for new item
 +                    ItemStack eventStack = CraftItemStack.asNMSCopy(event.getItem());
-+                    IDispenseBehavior idispensebehavior = (IDispenseBehavior) BlockDispenser.DISPENSER_REGISTRY.get(eventStack.getItem());
-+                    if (idispensebehavior != IDispenseBehavior.NOOP && idispensebehavior != this) {
-+                        idispensebehavior.dispense(sourceblock, eventStack);
-+                        return itemstack;
++                    DispenseItemBehavior idispensebehavior = (DispenseItemBehavior) DispenserBlock.DISPENSER_REGISTRY.get(eventStack.getItem());
++                    if (idispensebehavior != DispenseItemBehavior.NOOP && idispensebehavior != this) {
++                        idispensebehavior.dispense(pointer, eventStack);
++                        return stack;
 +                    }
 +                }
 +
-+                EntityTNTPrimed entitytntprimed = new EntityTNTPrimed(worldserver, event.getVelocity().getX(), event.getVelocity().getY(), event.getVelocity().getZ(), (EntityLiving) null);
++                PrimedTnt entitytntprimed = new PrimedTnt(worldserver, event.getVelocity().getX(), event.getVelocity().getY(), event.getVelocity().getZ(), (LivingEntity) null);
 +                // CraftBukkit end
- 
++
                  worldserver.addFreshEntity(entitytntprimed);
-                 worldserver.playSound((EntityHuman) null, entitytntprimed.getX(), entitytntprimed.getY(), entitytntprimed.getZ(), SoundEffects.TNT_PRIMED, SoundCategory.BLOCKS, 1.0F, 1.0F);
+                 worldserver.playSound((Player) null, entitytntprimed.getX(), entitytntprimed.getY(), entitytntprimed.getZ(), SoundEvents.TNT_PRIMED, SoundSource.BLOCKS, 1.0F, 1.0F);
                  worldserver.gameEvent((Entity) null, (Holder) GameEvent.ENTITY_PLACE, blockposition);
--                itemstack.shrink(1);
+-                stack.shrink(1);
 +                // itemstack.shrink(1); // CraftBukkit - handled above
-                 return itemstack;
+                 return stack;
              }
          });
-@@ -314,6 +604,30 @@
-                 EnumDirection enumdirection = (EnumDirection) sourceblock.state().getValue(BlockDispenser.FACING);
-                 BlockPosition blockposition = sourceblock.pos().relative(enumdirection);
+@@ -314,6 +602,30 @@
+                 Direction enumdirection = (Direction) pointer.state().getValue(DispenserBlock.FACING);
+                 BlockPos blockposition = pointer.pos().relative(enumdirection);
  
 +                // CraftBukkit start
-+                org.bukkit.block.Block bukkitBlock = CraftBlock.at(worldserver, sourceblock.pos());
-+                CraftItemStack craftItem = CraftItemStack.asCraftMirror(itemstack);
++                org.bukkit.block.Block bukkitBlock = CraftBlock.at(worldserver, pointer.pos());
++                CraftItemStack craftItem = CraftItemStack.asCraftMirror(stack);
 +
 +                BlockDispenseEvent event = new BlockDispenseEvent(bukkitBlock, craftItem.clone(), new org.bukkit.util.Vector(blockposition.getX(), blockposition.getY(), blockposition.getZ()));
-+                if (!BlockDispenser.eventFired) {
++                if (!DispenserBlock.eventFired) {
 +                    worldserver.getCraftServer().getPluginManager().callEvent(event);
 +                }
 +
 +                if (event.isCancelled()) {
-+                    return itemstack;
++                    return stack;
 +                }
 +
 +                if (!event.getItem().equals(craftItem)) {
 +                    // Chain to handler for new item
 +                    ItemStack eventStack = CraftItemStack.asNMSCopy(event.getItem());
-+                    IDispenseBehavior idispensebehavior = (IDispenseBehavior) BlockDispenser.DISPENSER_REGISTRY.get(eventStack.getItem());
-+                    if (idispensebehavior != IDispenseBehavior.NOOP && idispensebehavior != this) {
-+                        idispensebehavior.dispense(sourceblock, eventStack);
-+                        return itemstack;
++                    DispenseItemBehavior idispensebehavior = (DispenseItemBehavior) DispenserBlock.DISPENSER_REGISTRY.get(eventStack.getItem());
++                    if (idispensebehavior != DispenseItemBehavior.NOOP && idispensebehavior != this) {
++                        idispensebehavior.dispense(pointer, eventStack);
++                        return stack;
 +                    }
 +                }
 +                // CraftBukkit end
 +
-                 if (worldserver.isEmptyBlock(blockposition) && BlockWitherSkull.canSpawnMob(worldserver, blockposition, itemstack)) {
-                     worldserver.setBlock(blockposition, (IBlockData) Blocks.WITHER_SKELETON_SKULL.defaultBlockState().setValue(BlockSkull.ROTATION, RotationSegment.convertToSegment(enumdirection)), 3);
+                 if (worldserver.isEmptyBlock(blockposition) && WitherSkullBlock.canSpawnMob(worldserver, blockposition, stack)) {
+                     worldserver.setBlock(blockposition, (BlockState) Blocks.WITHER_SKELETON_SKULL.defaultBlockState().setValue(SkullBlock.ROTATION, RotationSegment.convertToSegment(enumdirection)), 3);
                      worldserver.gameEvent((Entity) null, (Holder) GameEvent.BLOCK_PLACE, blockposition);
-@@ -339,6 +653,30 @@
-                 BlockPosition blockposition = sourceblock.pos().relative((EnumDirection) sourceblock.state().getValue(BlockDispenser.FACING));
-                 BlockPumpkinCarved blockpumpkincarved = (BlockPumpkinCarved) Blocks.CARVED_PUMPKIN;
+@@ -339,6 +651,30 @@
+                 BlockPos blockposition = pointer.pos().relative((Direction) pointer.state().getValue(DispenserBlock.FACING));
+                 CarvedPumpkinBlock blockpumpkincarved = (CarvedPumpkinBlock) Blocks.CARVED_PUMPKIN;
  
 +                // CraftBukkit start
-+                org.bukkit.block.Block bukkitBlock = CraftBlock.at(worldserver, sourceblock.pos());
-+                CraftItemStack craftItem = CraftItemStack.asCraftMirror(itemstack);
++                org.bukkit.block.Block bukkitBlock = CraftBlock.at(worldserver, pointer.pos());
++                CraftItemStack craftItem = CraftItemStack.asCraftMirror(stack);
 +
 +                BlockDispenseEvent event = new BlockDispenseEvent(bukkitBlock, craftItem.clone(), new org.bukkit.util.Vector(blockposition.getX(), blockposition.getY(), blockposition.getZ()));
-+                if (!BlockDispenser.eventFired) {
++                if (!DispenserBlock.eventFired) {
 +                    worldserver.getCraftServer().getPluginManager().callEvent(event);
 +                }
 +
 +                if (event.isCancelled()) {
-+                    return itemstack;
++                    return stack;
 +                }
 +
 +                if (!event.getItem().equals(craftItem)) {
 +                    // Chain to handler for new item
 +                    ItemStack eventStack = CraftItemStack.asNMSCopy(event.getItem());
-+                    IDispenseBehavior idispensebehavior = (IDispenseBehavior) BlockDispenser.DISPENSER_REGISTRY.get(eventStack.getItem());
-+                    if (idispensebehavior != IDispenseBehavior.NOOP && idispensebehavior != this) {
-+                        idispensebehavior.dispense(sourceblock, eventStack);
-+                        return itemstack;
++                    DispenseItemBehavior idispensebehavior = (DispenseItemBehavior) DispenserBlock.DISPENSER_REGISTRY.get(eventStack.getItem());
++                    if (idispensebehavior != DispenseItemBehavior.NOOP && idispensebehavior != this) {
++                        idispensebehavior.dispense(pointer, eventStack);
++                        return stack;
 +                    }
 +                }
 +                // CraftBukkit end
@@ -483,63 +497,63 @@
                  if (worldserver.isEmptyBlock(blockposition) && blockpumpkincarved.canSpawnGolem(worldserver, blockposition)) {
                      if (!worldserver.isClientSide) {
                          worldserver.setBlock(blockposition, blockpumpkincarved.defaultBlockState(), 3);
-@@ -377,6 +715,30 @@
-                 BlockPosition blockposition = sourceblock.pos().relative((EnumDirection) sourceblock.state().getValue(BlockDispenser.FACING));
-                 IBlockData iblockdata = worldserver.getBlockState(blockposition);
+@@ -377,6 +713,30 @@
+                 BlockPos blockposition = pointer.pos().relative((Direction) pointer.state().getValue(DispenserBlock.FACING));
+                 BlockState iblockdata = worldserver.getBlockState(blockposition);
  
 +                // CraftBukkit start
-+                org.bukkit.block.Block bukkitBlock = CraftBlock.at(worldserver, sourceblock.pos());
-+                CraftItemStack craftItem = CraftItemStack.asCraftMirror(itemstack);
++                org.bukkit.block.Block bukkitBlock = CraftBlock.at(worldserver, pointer.pos());
++                CraftItemStack craftItem = CraftItemStack.asCraftMirror(stack);
 +
 +                BlockDispenseEvent event = new BlockDispenseEvent(bukkitBlock, craftItem.clone(), new org.bukkit.util.Vector(blockposition.getX(), blockposition.getY(), blockposition.getZ()));
-+                if (!BlockDispenser.eventFired) {
++                if (!DispenserBlock.eventFired) {
 +                    worldserver.getCraftServer().getPluginManager().callEvent(event);
 +                }
 +
 +                if (event.isCancelled()) {
-+                    return itemstack;
++                    return stack;
 +                }
 +
 +                if (!event.getItem().equals(craftItem)) {
 +                    // Chain to handler for new item
 +                    ItemStack eventStack = CraftItemStack.asNMSCopy(event.getItem());
-+                    IDispenseBehavior idispensebehavior = (IDispenseBehavior) BlockDispenser.DISPENSER_REGISTRY.get(eventStack.getItem());
-+                    if (idispensebehavior != IDispenseBehavior.NOOP && idispensebehavior != this) {
-+                        idispensebehavior.dispense(sourceblock, eventStack);
-+                        return itemstack;
++                    DispenseItemBehavior idispensebehavior = (DispenseItemBehavior) DispenserBlock.DISPENSER_REGISTRY.get(eventStack.getItem());
++                    if (idispensebehavior != DispenseItemBehavior.NOOP && idispensebehavior != this) {
++                        idispensebehavior.dispense(pointer, eventStack);
++                        return stack;
 +                    }
 +                }
 +                // CraftBukkit end
 +
-                 if (iblockdata.is(TagsBlock.BEEHIVES, (blockbase_blockdata) -> {
-                     return blockbase_blockdata.hasProperty(BlockBeehive.HONEY_LEVEL) && blockbase_blockdata.getBlock() instanceof BlockBeehive;
-                 }) && (Integer) iblockdata.getValue(BlockBeehive.HONEY_LEVEL) >= 5) {
-@@ -426,6 +788,31 @@
+                 if (iblockdata.is(BlockTags.BEEHIVES, (blockbase_blockdata) -> {
+                     return blockbase_blockdata.hasProperty(BeehiveBlock.HONEY_LEVEL) && blockbase_blockdata.getBlock() instanceof BeehiveBlock;
+                 }) && (Integer) iblockdata.getValue(BeehiveBlock.HONEY_LEVEL) >= 5) {
+@@ -426,6 +786,31 @@
                      this.setSuccess(false);
-                     return itemstack;
+                     return stack;
                  } else {
 +                    // CraftBukkit start
-+                    ItemStack itemstack1 = itemstack;
-+                    WorldServer world = sourceblock.level();
-+                    org.bukkit.block.Block block = CraftBlock.at(world, sourceblock.pos());
++                    ItemStack itemstack1 = stack;
++                    ServerLevel world = pointer.level();
++                    org.bukkit.block.Block block = CraftBlock.at(world, pointer.pos());
 +                    CraftItemStack craftItem = CraftItemStack.asCraftMirror(itemstack1);
 +
 +                    BlockDispenseEvent event = new BlockDispenseArmorEvent(block, craftItem.clone(), (org.bukkit.craftbukkit.entity.CraftLivingEntity) list.get(0).getBukkitEntity());
-+                    if (!BlockDispenser.eventFired) {
++                    if (!DispenserBlock.eventFired) {
 +                        world.getCraftServer().getPluginManager().callEvent(event);
 +                    }
 +
 +                    if (event.isCancelled()) {
-+                        return itemstack;
++                        return stack;
 +                    }
 +
 +                    if (!event.getItem().equals(craftItem)) {
 +                        // Chain to handler for new item
 +                        ItemStack eventStack = CraftItemStack.asNMSCopy(event.getItem());
-+                        IDispenseBehavior idispensebehavior = (IDispenseBehavior) BlockDispenser.DISPENSER_REGISTRY.get(eventStack.getItem());
-+                        if (idispensebehavior != IDispenseBehavior.NOOP && idispensebehavior != EquipmentDispenseItemBehavior.INSTANCE) {
-+                            idispensebehavior.dispense(sourceblock, eventStack);
-+                            return itemstack;
++                        DispenseItemBehavior idispensebehavior = (DispenseItemBehavior) DispenserBlock.DISPENSER_REGISTRY.get(eventStack.getItem());
++                        if (idispensebehavior != DispenseItemBehavior.NOOP && idispensebehavior != EquipmentDispenseItemBehavior.INSTANCE) {
++                            idispensebehavior.dispense(pointer, eventStack);
++                            return stack;
 +                        }
 +                    }
 +                    // CraftBukkit end

paper-server/patches/sources/net/minecraft/core/dispenser/EquipmentDispenseItemBehavior.java.patch

@@ -1,52 +1,52 @@
 --- a/net/minecraft/core/dispenser/EquipmentDispenseItemBehavior.java
 +++ b/net/minecraft/core/dispenser/EquipmentDispenseItemBehavior.java
-@@ -10,6 +10,13 @@
- import net.minecraft.world.level.block.BlockDispenser;
- import net.minecraft.world.phys.AxisAlignedBB;
- 
-+// CraftBukkit start
-+import net.minecraft.world.level.World;
+@@ -7,8 +7,13 @@
+ import net.minecraft.world.entity.LivingEntity;
+ import net.minecraft.world.entity.Mob;
+ import net.minecraft.world.item.ItemStack;
++import net.minecraft.world.level.Level;
+ import net.minecraft.world.level.block.DispenserBlock;
+ import net.minecraft.world.phys.AABB;
 +import org.bukkit.craftbukkit.block.CraftBlock;
 +import org.bukkit.craftbukkit.inventory.CraftItemStack;
 +import org.bukkit.event.block.BlockDispenseArmorEvent;
 +// CraftBukkit end
-+
- public class EquipmentDispenseItemBehavior extends DispenseBehaviorItem {
  
-     public static final EquipmentDispenseItemBehavior INSTANCE = new EquipmentDispenseItemBehavior();
-@@ -34,7 +41,34 @@
-             EnumItemSlot enumitemslot = entityliving.getEquipmentSlotForItem(itemstack);
-             ItemStack itemstack1 = itemstack.split(1);
+ public class EquipmentDispenseItemBehavior extends DefaultDispenseItemBehavior {
+ 
+@@ -34,7 +39,34 @@
+             EquipmentSlot enumitemslot = entityliving.getEquipmentSlotForItem(stack);
+             ItemStack itemstack1 = stack.split(1);
  
 -            entityliving.setItemSlot(enumitemslot, itemstack1);
 +            // CraftBukkit start
-+            World world = sourceblock.level();
-+            org.bukkit.block.Block block = CraftBlock.at(world, sourceblock.pos());
++            Level world = pointer.level();
++            org.bukkit.block.Block block = CraftBlock.at(world, pointer.pos());
 +            CraftItemStack craftItem = CraftItemStack.asCraftMirror(itemstack1);
 +
 +            BlockDispenseArmorEvent event = new BlockDispenseArmorEvent(block, craftItem.clone(), (org.bukkit.craftbukkit.entity.CraftLivingEntity) entityliving.getBukkitEntity());
-+            if (!BlockDispenser.eventFired) {
++            if (!DispenserBlock.eventFired) {
 +                world.getCraftServer().getPluginManager().callEvent(event);
 +            }
 +
 +            if (event.isCancelled()) {
-+                itemstack.grow(1);
++                stack.grow(1);
 +                return false;
 +            }
 +
 +            if (!event.getItem().equals(craftItem)) {
-+                itemstack.grow(1);
++                stack.grow(1);
 +                // Chain to handler for new item
 +                ItemStack eventStack = CraftItemStack.asNMSCopy(event.getItem());
-+                IDispenseBehavior idispensebehavior = (IDispenseBehavior) BlockDispenser.DISPENSER_REGISTRY.get(eventStack.getItem());
-+                if (idispensebehavior != IDispenseBehavior.NOOP && idispensebehavior != EquipmentDispenseItemBehavior.INSTANCE) {
-+                    idispensebehavior.dispense(sourceblock, eventStack);
++                DispenseItemBehavior idispensebehavior = (DispenseItemBehavior) DispenserBlock.DISPENSER_REGISTRY.get(eventStack.getItem());
++                if (idispensebehavior != DispenseItemBehavior.NOOP && idispensebehavior != EquipmentDispenseItemBehavior.INSTANCE) {
++                    idispensebehavior.dispense(pointer, eventStack);
 +                    return true;
 +                }
 +            }
 +
 +            entityliving.setItemSlot(enumitemslot, CraftItemStack.asNMSCopy(event.getItem()));
 +            // CraftBukkit end
-             if (entityliving instanceof EntityInsentient) {
-                 EntityInsentient entityinsentient = (EntityInsentient) entityliving;
+             if (entityliving instanceof Mob) {
+                 Mob entityinsentient = (Mob) entityliving;
  

paper-server/patches/sources/net/minecraft/core/dispenser/MinecartDispenseItemBehavior.java.patch

@@ -1,59 +1,58 @@
 --- a/net/minecraft/core/dispenser/MinecartDispenseItemBehavior.java
 +++ b/net/minecraft/core/dispenser/MinecartDispenseItemBehavior.java
-@@ -16,6 +16,12 @@
- import net.minecraft.world.level.block.state.properties.BlockPropertyTrackPosition;
- import net.minecraft.world.phys.Vec3D;
- 
+@@ -15,6 +15,11 @@
+ import net.minecraft.world.level.block.state.BlockState;
+ import net.minecraft.world.level.block.state.properties.RailShape;
+ import net.minecraft.world.phys.Vec3;
 +// CraftBukkit start
 +import org.bukkit.craftbukkit.block.CraftBlock;
 +import org.bukkit.craftbukkit.inventory.CraftItemStack;
 +import org.bukkit.event.block.BlockDispenseEvent;
 +// CraftBukkit end
-+
- public class MinecartDispenseItemBehavior extends DispenseBehaviorItem {
  
-     private final DispenseBehaviorItem defaultDispenseItemBehavior = new DispenseBehaviorItem();
-@@ -62,11 +68,40 @@
+ public class MinecartDispenseItemBehavior extends DefaultDispenseItemBehavior {
+ 
+@@ -62,11 +67,40 @@
          }
  
-         Vec3D vec3d1 = new Vec3D(d0, d1 + d3, d2);
--        EntityMinecartAbstract entityminecartabstract = EntityMinecartAbstract.createMinecart(worldserver, vec3d1.x, vec3d1.y, vec3d1.z, this.entityType, EntitySpawnReason.DISPENSER, itemstack, (EntityHuman) null);
+         Vec3 vec3d1 = new Vec3(d0, d1 + d3, d2);
+-        AbstractMinecart entityminecartabstract = AbstractMinecart.createMinecart(worldserver, vec3d1.x, vec3d1.y, vec3d1.z, this.entityType, EntitySpawnReason.DISPENSER, stack, (Player) null);
 +        // CraftBukkit start
 +        // EntityMinecartAbstract entityminecartabstract = EntityMinecartAbstract.createMinecart(worldserver, vec3d1.x, vec3d1.y, vec3d1.z, this.entityType, EntitySpawnReason.DISPENSER, itemstack, (EntityHuman) null);
-+        ItemStack itemstack1 = itemstack.split(1);
-+        org.bukkit.block.Block block2 = CraftBlock.at(worldserver, sourceblock.pos());
++        ItemStack itemstack1 = stack.split(1);
++        org.bukkit.block.Block block2 = CraftBlock.at(worldserver, pointer.pos());
 +        CraftItemStack craftItem = CraftItemStack.asCraftMirror(itemstack1);
-+
+ 
 +        BlockDispenseEvent event = new BlockDispenseEvent(block2, craftItem.clone(), new org.bukkit.util.Vector(vec3d1.x, vec3d1.y, vec3d1.z));
-+        if (!BlockDispenser.eventFired) {
++        if (!DispenserBlock.eventFired) {
 +            worldserver.getCraftServer().getPluginManager().callEvent(event);
 +        }
 +
 +        if (event.isCancelled()) {
-+            itemstack.grow(1);
-+            return itemstack;
++            stack.grow(1);
++            return stack;
 +        }
 +
 +        if (!event.getItem().equals(craftItem)) {
-+            itemstack.grow(1);
++            stack.grow(1);
 +            // Chain to handler for new item
 +            ItemStack eventStack = CraftItemStack.asNMSCopy(event.getItem());
-+            IDispenseBehavior idispensebehavior = (IDispenseBehavior) BlockDispenser.DISPENSER_REGISTRY.get(eventStack.getItem());
-+            if (idispensebehavior != IDispenseBehavior.NOOP && idispensebehavior != this) {
-+                idispensebehavior.dispense(sourceblock, eventStack);
-+                return itemstack;
++            DispenseItemBehavior idispensebehavior = (DispenseItemBehavior) DispenserBlock.DISPENSER_REGISTRY.get(eventStack.getItem());
++            if (idispensebehavior != DispenseItemBehavior.NOOP && idispensebehavior != this) {
++                idispensebehavior.dispense(pointer, eventStack);
++                return stack;
 +            }
 +        }
 +
 +        itemstack1 = CraftItemStack.asNMSCopy(event.getItem());
-+        EntityMinecartAbstract entityminecartabstract = EntityMinecartAbstract.createMinecart(worldserver, event.getVelocity().getX(), event.getVelocity().getY(), event.getVelocity().getZ(), this.entityType, EntitySpawnReason.DISPENSER, itemstack1, (EntityHuman) null);
- 
++        AbstractMinecart entityminecartabstract = AbstractMinecart.createMinecart(worldserver, event.getVelocity().getX(), event.getVelocity().getY(), event.getVelocity().getZ(), this.entityType, EntitySpawnReason.DISPENSER, itemstack1, (Player) null);
++
          if (entityminecartabstract != null) {
 -            worldserver.addFreshEntity(entityminecartabstract);
--            itemstack.shrink(1);
-+            if (!worldserver.addFreshEntity(entityminecartabstract)) itemstack.grow(1);
+-            stack.shrink(1);
++            if (!worldserver.addFreshEntity(entityminecartabstract)) stack.grow(1);
 +            // itemstack.shrink(1); // CraftBukkit - handled during event processing
 +            // CraftBukkit end
          }
  
-         return itemstack;
+         return stack;

paper-server/patches/sources/net/minecraft/core/dispenser/ProjectileDispenseBehavior.java.patch

@@ -0,0 +1,57 @@
+--- a/net/minecraft/core/dispenser/ProjectileDispenseBehavior.java
++++ b/net/minecraft/core/dispenser/ProjectileDispenseBehavior.java
+@@ -8,6 +8,11 @@
+ import net.minecraft.world.item.ItemStack;
+ import net.minecraft.world.item.ProjectileItem;
+ import net.minecraft.world.level.block.DispenserBlock;
++// CraftBukkit start
++import org.bukkit.craftbukkit.block.CraftBlock;
++import org.bukkit.craftbukkit.inventory.CraftItemStack;
++import org.bukkit.event.block.BlockDispenseEvent;
++// CraftBukkit end
+ 
+ public class ProjectileDispenseBehavior extends DefaultDispenseItemBehavior {
+ 
+@@ -31,8 +36,40 @@
+         Direction enumdirection = (Direction) pointer.state().getValue(DispenserBlock.FACING);
+         Position iposition = this.dispenseConfig.positionFunction().getDispensePosition(pointer, enumdirection);
+ 
+-        Projectile.spawnProjectileUsingShoot(this.projectileItem.asProjectile(worldserver, iposition, stack, enumdirection), worldserver, stack, (double) enumdirection.getStepX(), (double) enumdirection.getStepY(), (double) enumdirection.getStepZ(), this.dispenseConfig.power(), this.dispenseConfig.uncertainty());
+-        stack.shrink(1);
++        // CraftBukkit start
++        // IProjectile.spawnProjectileUsingShoot(this.projectileItem.asProjectile(worldserver, iposition, itemstack, enumdirection), worldserver, itemstack, (double) enumdirection.getStepX(), (double) enumdirection.getStepY(), (double) enumdirection.getStepZ(), this.dispenseConfig.power(), this.dispenseConfig.uncertainty()); // CraftBukkit - call when finish the BlockDispenseEvent
++        ItemStack itemstack1 = stack.split(1);
++        org.bukkit.block.Block block = CraftBlock.at(worldserver, pointer.pos());
++        CraftItemStack craftItem = CraftItemStack.asCraftMirror(itemstack1);
++
++        BlockDispenseEvent event = new BlockDispenseEvent(block, craftItem.clone(), new org.bukkit.util.Vector((double) enumdirection.getStepX(), (double) enumdirection.getStepY(), (double) enumdirection.getStepZ()));
++        if (!DispenserBlock.eventFired) {
++            worldserver.getCraftServer().getPluginManager().callEvent(event);
++        }
++
++        if (event.isCancelled()) {
++            stack.grow(1);
++            return stack;
++        }
++
++        if (!event.getItem().equals(craftItem)) {
++            stack.grow(1);
++            // Chain to handler for new item
++            ItemStack eventStack = CraftItemStack.asNMSCopy(event.getItem());
++            DispenseItemBehavior idispensebehavior = (DispenseItemBehavior) DispenserBlock.DISPENSER_REGISTRY.get(eventStack.getItem());
++            if (idispensebehavior != DispenseItemBehavior.NOOP && idispensebehavior != this) {
++                idispensebehavior.dispense(pointer, eventStack);
++                return stack;
++            }
++        }
++
++        // SPIGOT-7923: Avoid create projectiles with empty item
++        if (!itemstack1.isEmpty()) {
++            Projectile iprojectile = Projectile.spawnProjectileUsingShoot(this.projectileItem.asProjectile(worldserver, iposition, itemstack1, enumdirection), worldserver, itemstack1, event.getVelocity().getX(), event.getVelocity().getY(), event.getVelocity().getZ(), this.dispenseConfig.power(), this.dispenseConfig.uncertainty());
++            iprojectile.projectileSource = new org.bukkit.craftbukkit.projectiles.CraftBlockProjectileSource(pointer.blockEntity());
++        }
++        // itemstack.shrink(1); // CraftBukkit - Handled during event processing
++        // CraftBukkit end
+         return stack;
+     }
+ 

paper-server/patches/sources/net/minecraft/core/dispenser/ShearsDispenseItemBehavior.java.patch

@@ -0,0 +1,78 @@
+--- a/net/minecraft/core/dispenser/ShearsDispenseItemBehavior.java
++++ b/net/minecraft/core/dispenser/ShearsDispenseItemBehavior.java
+@@ -22,6 +22,12 @@
+ import net.minecraft.world.level.block.state.BlockState;
+ import net.minecraft.world.level.gameevent.GameEvent;
+ import net.minecraft.world.phys.AABB;
++// CraftBukkit start
++import org.bukkit.craftbukkit.block.CraftBlock;
++import org.bukkit.craftbukkit.event.CraftEventFactory;
++import org.bukkit.craftbukkit.inventory.CraftItemStack;
++import org.bukkit.event.block.BlockDispenseEvent;
++// CraftBukkit end
+ 
+ public class ShearsDispenseItemBehavior extends OptionalDispenseItemBehavior {
+ 
+@@ -30,11 +36,34 @@
+     @Override
+     protected ItemStack execute(BlockSource pointer, ItemStack stack) {
+         ServerLevel worldserver = pointer.level();
++        // CraftBukkit start
++        org.bukkit.block.Block bukkitBlock = CraftBlock.at(worldserver, pointer.pos());
++        CraftItemStack craftItem = CraftItemStack.asCraftMirror(stack);
+ 
++        BlockDispenseEvent event = new BlockDispenseEvent(bukkitBlock, craftItem.clone(), new org.bukkit.util.Vector(0, 0, 0));
++        if (!DispenserBlock.eventFired) {
++            worldserver.getCraftServer().getPluginManager().callEvent(event);
++        }
++
++        if (event.isCancelled()) {
++            return stack;
++        }
++
++        if (!event.getItem().equals(craftItem)) {
++            // Chain to handler for new item
++            ItemStack eventStack = CraftItemStack.asNMSCopy(event.getItem());
++            DispenseItemBehavior idispensebehavior = (DispenseItemBehavior) DispenserBlock.DISPENSER_REGISTRY.get(eventStack.getItem());
++            if (idispensebehavior != DispenseItemBehavior.NOOP && idispensebehavior != this) {
++                idispensebehavior.dispense(pointer, eventStack);
++                return stack;
++            }
++        }
++        // CraftBukkit end
++
+         if (!worldserver.isClientSide()) {
+             BlockPos blockposition = pointer.pos().relative((Direction) pointer.state().getValue(DispenserBlock.FACING));
+ 
+-            this.setSuccess(ShearsDispenseItemBehavior.tryShearBeehive(worldserver, blockposition) || ShearsDispenseItemBehavior.tryShearLivingEntity(worldserver, blockposition, stack));
++            this.setSuccess(ShearsDispenseItemBehavior.tryShearBeehive(worldserver, blockposition) || ShearsDispenseItemBehavior.tryShearLivingEntity(worldserver, blockposition, stack, bukkitBlock, craftItem)); // CraftBukkit
+             if (this.isSuccess()) {
+                 stack.hurtAndBreak(1, worldserver, (ServerPlayer) null, (item) -> {
+                 });
+@@ -64,8 +93,8 @@
+         return false;
+     }
+ 
+-    private static boolean tryShearLivingEntity(ServerLevel world, BlockPos pos, ItemStack shears) {
+-        List<LivingEntity> list = world.getEntitiesOfClass(LivingEntity.class, new AABB(pos), EntitySelector.NO_SPECTATORS);
++    private static boolean tryShearLivingEntity(ServerLevel worldserver, BlockPos blockposition, ItemStack itemstack, org.bukkit.block.Block bukkitBlock, CraftItemStack craftItem) { // CraftBukkit - add args
++        List<LivingEntity> list = worldserver.getEntitiesOfClass(LivingEntity.class, new AABB(blockposition), EntitySelector.NO_SPECTATORS);
+         Iterator iterator = list.iterator();
+ 
+         while (iterator.hasNext()) {
+@@ -73,8 +102,13 @@
+ 
+             if (entityliving instanceof Shearable ishearable) {
+                 if (ishearable.readyForShearing()) {
+-                    ishearable.shear(world, SoundSource.BLOCKS, shears);
+-                    world.gameEvent((Entity) null, (Holder) GameEvent.SHEAR, pos);
++                    // CraftBukkit start
++                    if (CraftEventFactory.callBlockShearEntityEvent(entityliving, bukkitBlock, craftItem).isCancelled()) {
++                        continue;
++                    }
++                    // CraftBukkit end
++                    ishearable.shear(worldserver, SoundSource.BLOCKS, itemstack);
++                    worldserver.gameEvent((Entity) null, (Holder) GameEvent.SHEAR, blockposition);
+                     return true;
+                 }
+             }

paper-server/patches/sources/net/minecraft/core/dispenser/ShulkerBoxDispenseBehavior.java.patch

@@ -0,0 +1,46 @@
+--- a/net/minecraft/core/dispenser/ShulkerBoxDispenseBehavior.java
++++ b/net/minecraft/core/dispenser/ShulkerBoxDispenseBehavior.java
+@@ -10,6 +10,12 @@
+ import net.minecraft.world.level.block.DispenserBlock;
+ import org.slf4j.Logger;
+ 
++// CraftBukkit start
++import org.bukkit.craftbukkit.block.CraftBlock;
++import org.bukkit.craftbukkit.inventory.CraftItemStack;
++import org.bukkit.event.block.BlockDispenseEvent;
++// CraftBukkit end
++
+ public class ShulkerBoxDispenseBehavior extends OptionalDispenseItemBehavior {
+ 
+     private static final Logger LOGGER = LogUtils.getLogger();
+@@ -26,6 +32,30 @@
+             BlockPos blockposition = pointer.pos().relative(enumdirection);
+             Direction enumdirection1 = pointer.level().isEmptyBlock(blockposition.below()) ? enumdirection : Direction.UP;
+ 
++            // CraftBukkit start
++            org.bukkit.block.Block bukkitBlock = CraftBlock.at(pointer.level(), pointer.pos());
++            CraftItemStack craftItem = CraftItemStack.asCraftMirror(stack);
++
++            BlockDispenseEvent event = new BlockDispenseEvent(bukkitBlock, craftItem.clone(), new org.bukkit.util.Vector(blockposition.getX(), blockposition.getY(), blockposition.getZ()));
++            if (!DispenserBlock.eventFired) {
++                pointer.level().getCraftServer().getPluginManager().callEvent(event);
++            }
++
++            if (event.isCancelled()) {
++                return stack;
++            }
++
++            if (!event.getItem().equals(craftItem)) {
++                // Chain to handler for new item
++                ItemStack eventStack = CraftItemStack.asNMSCopy(event.getItem());
++                DispenseItemBehavior idispensebehavior = (DispenseItemBehavior) DispenserBlock.DISPENSER_REGISTRY.get(eventStack.getItem());
++                if (idispensebehavior != DispenseItemBehavior.NOOP && idispensebehavior != this) {
++                    idispensebehavior.dispense(pointer, eventStack);
++                    return stack;
++                }
++            }
++            // CraftBukkit end
++
+             try {
+                 this.setSuccess(((BlockItem) item).place(new DirectionalPlaceContext(pointer.level(), blockposition, enumdirection, stack, enumdirection1)).consumesAction());
+             } catch (Exception exception) {