1 files changed, 78 insertions, 0 deletions
diff --git a/patches/server/0440-Add-PlayerShearBlockEvent.patch b/patches/server/0440-Add-PlayerShearBlockEvent.patch
new file mode 100644
index 0000000000..c659b655c0
--- /dev/null
+++ b/patches/server/0440-Add-PlayerShearBlockEvent.patch
@@ -0,0 +1,78 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: JRoy <[email protected]>
+Date: Thu, 27 Aug 2020 15:02:48 -0400
+Subject: [PATCH] Add PlayerShearBlockEvent
+
+
+diff --git a/src/main/java/net/minecraft/world/level/block/BeehiveBlock.java b/src/main/java/net/minecraft/world/level/block/BeehiveBlock.java
+index c4b9c574bfb034fc78a596367f0f41dbde5eb93d..8d6736003934c5958f600660bdee58b386c39da4 100644
+--- a/src/main/java/net/minecraft/world/level/block/BeehiveBlock.java
++++ b/src/main/java/net/minecraft/world/level/block/BeehiveBlock.java
+@@ -127,7 +127,7 @@ public class BeehiveBlock extends BaseEntityBlock {
+     }
+ 
+     public static void dropHoneycomb(Level world, BlockPos pos) {
+-        popResource(world, pos, new ItemStack(Items.HONEYCOMB, 3));
++        popResource(world, pos, new ItemStack(Items.HONEYCOMB, 3)); // Paper - Add PlayerShearBlockEvent; conflict on change, item needs to be set below
+     }
+ 
+     @Override
+@@ -139,8 +139,19 @@ public class BeehiveBlock extends BaseEntityBlock {
+             Item item = stack.getItem();
+ 
+             if (stack.is(Items.SHEARS)) {
++                // Paper start - Add PlayerShearBlockEvent
++                io.papermc.paper.event.block.PlayerShearBlockEvent event = new io.papermc.paper.event.block.PlayerShearBlockEvent((org.bukkit.entity.Player) player.getBukkitEntity(), org.bukkit.craftbukkit.block.CraftBlock.at(world, pos), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(stack), org.bukkit.craftbukkit.CraftEquipmentSlot.getHand(hand), new java.util.ArrayList<>());
++                event.getDrops().add(org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(new ItemStack(Items.HONEYCOMB, 3)));
++                if (!event.callEvent()) {
++                    return ItemInteractionResult.SKIP_DEFAULT_BLOCK_INTERACTION;
++                }
++                // Paper end
+                 world.playSound(player, player.getX(), player.getY(), player.getZ(), SoundEvents.BEEHIVE_SHEAR, SoundSource.BLOCKS, 1.0F, 1.0F);
+-                BeehiveBlock.dropHoneycomb(world, pos);
++                // Paper start - Add PlayerShearBlockEvent
++                for (org.bukkit.inventory.ItemStack itemDrop : event.getDrops()) {
++                    popResource(world, pos, org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(itemDrop));
++                }
++                // Paper end - Add PlayerShearBlockEvent
+                 stack.hurtAndBreak(1, player, LivingEntity.getSlotForHand(hand));
+                 flag = true;
+                 world.gameEvent((Entity) player, (Holder) GameEvent.SHEAR, pos);
+diff --git a/src/main/java/net/minecraft/world/level/block/PumpkinBlock.java b/src/main/java/net/minecraft/world/level/block/PumpkinBlock.java
+index aa8667f0b14dc8944dd3457b431162e59bf54ada..5f5b2dd2bb45a0d3ae7de063b3bc611d01af21c0 100644
+--- a/src/main/java/net/minecraft/world/level/block/PumpkinBlock.java
++++ b/src/main/java/net/minecraft/world/level/block/PumpkinBlock.java
+@@ -40,16 +40,24 @@ public class PumpkinBlock extends Block {
+         } else if (world.isClientSide) {
+             return ItemInteractionResult.sidedSuccess(world.isClientSide);
+         } else {
++            // Paper start - Add PlayerShearBlockEvent
++            io.papermc.paper.event.block.PlayerShearBlockEvent event = new io.papermc.paper.event.block.PlayerShearBlockEvent((org.bukkit.entity.Player) player.getBukkitEntity(), org.bukkit.craftbukkit.block.CraftBlock.at(world, pos), org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(stack), org.bukkit.craftbukkit.CraftEquipmentSlot.getHand(hand), new java.util.ArrayList<>());
++            event.getDrops().add(org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(new ItemStack(Items.PUMPKIN_SEEDS, 4)));
++            if (!event.callEvent()) {
++                return ItemInteractionResult.SKIP_DEFAULT_BLOCK_INTERACTION;
++            }
++            // Paper end - Add PlayerShearBlockEvent
+             Direction direction = hit.getDirection();
+             Direction direction2 = direction.getAxis() == Direction.Axis.Y ? player.getDirection().getOpposite() : direction;
+             world.playSound(null, pos, SoundEvents.PUMPKIN_CARVE, SoundSource.BLOCKS, 1.0F, 1.0F);
+             world.setBlock(pos, Blocks.CARVED_PUMPKIN.defaultBlockState().setValue(CarvedPumpkinBlock.FACING, direction2), 11);
++            for (org.bukkit.inventory.ItemStack item : event.getDrops()) { // Paper - Add PlayerShearBlockEvent
+             ItemEntity itemEntity = new ItemEntity(
+                 world,
+                 (double)pos.getX() + 0.5 + (double)direction2.getStepX() * 0.65,
+                 (double)pos.getY() + 0.1,
+                 (double)pos.getZ() + 0.5 + (double)direction2.getStepZ() * 0.65,
+-                new ItemStack(Items.PUMPKIN_SEEDS, 4)
++                org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(item) // Paper - Add PlayerShearBlockEvent
+             );
+             itemEntity.setDeltaMovement(
+                 0.05 * (double)direction2.getStepX() + world.random.nextDouble() * 0.02,
+@@ -57,6 +65,7 @@ public class PumpkinBlock extends Block {
+                 0.05 * (double)direction2.getStepZ() + world.random.nextDouble() * 0.02
+             );
+             world.addFreshEntity(itemEntity);
++            } // Paper - Add PlayerShearBlockEvent
+             stack.hurtAndBreak(1, player, LivingEntity.getSlotForHand(hand));
+             world.gameEvent(player, GameEvent.SHEAR, pos);
+             player.awardStat(Stats.ITEM_USED.get(Items.SHEARS));