1 files changed, 103 insertions, 0 deletions
diff --git a/patch-remap/og/net/minecraft/world/level/block/BlockRedstoneOre.patch b/patch-remap/og/net/minecraft/world/level/block/BlockRedstoneOre.patch
new file mode 100644
index 0000000000..2667a38da8
--- /dev/null
+++ b/patch-remap/og/net/minecraft/world/level/block/BlockRedstoneOre.patch
@@ -0,0 +1,103 @@
+--- a/net/minecraft/world/level/block/BlockRedstoneOre.java
++++ b/net/minecraft/world/level/block/BlockRedstoneOre.java
+@@ -22,6 +22,11 @@
+ import net.minecraft.world.level.block.state.properties.BlockStateBoolean;
+ import net.minecraft.world.phys.MovingObjectPositionBlock;
+ 
++// CraftBukkit start
++import org.bukkit.craftbukkit.event.CraftEventFactory;
++import org.bukkit.event.entity.EntityInteractEvent;
++// CraftBukkit end
++
+ public class BlockRedstoneOre extends Block {
+ 
+     public static final MapCodec<BlockRedstoneOre> CODEC = simpleCodec(BlockRedstoneOre::new);
+@@ -39,14 +44,27 @@
+ 
+     @Override
+     public void attack(IBlockData iblockdata, World world, BlockPosition blockposition, EntityHuman entityhuman) {
+-        interact(iblockdata, world, blockposition);
++        interact(iblockdata, world, blockposition, entityhuman); // CraftBukkit - add entityhuman
+         super.attack(iblockdata, world, blockposition, entityhuman);
+     }
+ 
+     @Override
+     public void stepOn(World world, BlockPosition blockposition, IBlockData iblockdata, Entity entity) {
+         if (!entity.isSteppingCarefully()) {
+-            interact(iblockdata, world, blockposition);
++            // CraftBukkit start
++            if (entity instanceof EntityHuman) {
++                org.bukkit.event.player.PlayerInteractEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerInteractEvent((EntityHuman) entity, org.bukkit.event.block.Action.PHYSICAL, blockposition, null, null, null);
++                if (!event.isCancelled()) {
++                    interact(world.getBlockState(blockposition), world, blockposition, entity); // add entity
++                }
++            } else {
++                EntityInteractEvent event = new EntityInteractEvent(entity.getBukkitEntity(), world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ()));
++                world.getCraftServer().getPluginManager().callEvent(event);
++                if (!event.isCancelled()) {
++                    interact(world.getBlockState(blockposition), world, blockposition, entity); // add entity
++                }
++            }
++            // CraftBukkit end
+         }
+ 
+         super.stepOn(world, blockposition, iblockdata, entity);
+@@ -57,7 +75,7 @@
+         if (world.isClientSide) {
+             spawnParticles(world, blockposition);
+         } else {
+-            interact(iblockdata, world, blockposition);
++            interact(iblockdata, world, blockposition, entityhuman); // CraftBukkit - add entityhuman
+         }
+ 
+         ItemStack itemstack = entityhuman.getItemInHand(enumhand);
+@@ -65,9 +83,14 @@
+         return itemstack.getItem() instanceof ItemBlock && (new BlockActionContext(entityhuman, enumhand, itemstack, movingobjectpositionblock)).canPlace() ? EnumInteractionResult.PASS : EnumInteractionResult.SUCCESS;
+     }
+ 
+-    private static void interact(IBlockData iblockdata, World world, BlockPosition blockposition) {
++    private static void interact(IBlockData iblockdata, World world, BlockPosition blockposition, Entity entity) { // CraftBukkit - add Entity
+         spawnParticles(world, blockposition);
+         if (!(Boolean) iblockdata.getValue(BlockRedstoneOre.LIT)) {
++            // CraftBukkit start
++            if (!CraftEventFactory.callEntityChangeBlockEvent(entity, blockposition, iblockdata.setValue(BlockRedstoneOre.LIT, true))) {
++                return;
++            }
++            // CraftBukkit end
+             world.setBlock(blockposition, (IBlockData) iblockdata.setValue(BlockRedstoneOre.LIT, true), 3);
+         }
+ 
+@@ -81,6 +104,11 @@
+     @Override
+     public void randomTick(IBlockData iblockdata, WorldServer worldserver, BlockPosition blockposition, RandomSource randomsource) {
+         if ((Boolean) iblockdata.getValue(BlockRedstoneOre.LIT)) {
++            // CraftBukkit start
++            if (CraftEventFactory.callBlockFadeEvent(worldserver, blockposition, iblockdata.setValue(BlockRedstoneOre.LIT, false)).isCancelled()) {
++                return;
++            }
++            // CraftBukkit end
+             worldserver.setBlock(blockposition, (IBlockData) iblockdata.setValue(BlockRedstoneOre.LIT, false), 3);
+         }
+ 
+@@ -89,12 +117,20 @@
+     @Override
+     public void spawnAfterBreak(IBlockData iblockdata, WorldServer worldserver, BlockPosition blockposition, ItemStack itemstack, boolean flag) {
+         super.spawnAfterBreak(iblockdata, worldserver, blockposition, itemstack, flag);
++        // CraftBukkit start - Delegated to getExpDrop
++    }
++
++    @Override
++    public int getExpDrop(IBlockData iblockdata, WorldServer worldserver, BlockPosition blockposition, ItemStack itemstack, boolean flag) {
+         if (flag && EnchantmentManager.getItemEnchantmentLevel(Enchantments.SILK_TOUCH, itemstack) == 0) {
+             int i = 1 + worldserver.random.nextInt(5);
+ 
+-            this.popExperience(worldserver, blockposition, i);
++            // this.popExperience(worldserver, blockposition, i);
++            return i;
+         }
+ 
++        return 0;
++        // CraftBukkit end
+     }
+ 
+     @Override