diff options
Diffstat (limited to 'nms-patches/BlockRedstoneOre.patch')
| -rw-r--r-- | nms-patches/BlockRedstoneOre.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/nms-patches/BlockRedstoneOre.patch b/nms-patches/BlockRedstoneOre.patch index 417cd311..c4b08ac9 100644 --- a/nms-patches/BlockRedstoneOre.patch +++ b/nms-patches/BlockRedstoneOre.patch @@ -1,8 +1,8 @@ --- a/net/minecraft/server/BlockRedstoneOre.java +++ b/net/minecraft/server/BlockRedstoneOre.java -@@ -3,6 +3,11 @@ +@@ -2,6 +2,11 @@ + import java.util.Random; - import javax.annotation.Nullable; +// CraftBukkit start +import org.bukkit.craftbukkit.event.CraftEventFactory; @@ -12,7 +12,7 @@ public class BlockRedstoneOre extends Block { private final boolean a; -@@ -21,23 +26,45 @@ +@@ -20,23 +25,45 @@ } public void attack(World world, BlockPosition blockposition, EntityHuman entityhuman) { @@ -45,10 +45,10 @@ } + - public boolean interact(World world, BlockPosition blockposition, IBlockData iblockdata, EntityHuman entityhuman, EnumHand enumhand, @Nullable ItemStack itemstack, EnumDirection enumdirection, float f, float f1, float f2) { + public boolean interact(World world, BlockPosition blockposition, IBlockData iblockdata, EntityHuman entityhuman, EnumHand enumhand, EnumDirection enumdirection, float f, float f1, float f2) { - this.interact(world, blockposition); + this.interact(world, blockposition, entityhuman); // CraftBukkit - add entityhuman - return super.interact(world, blockposition, iblockdata, entityhuman, enumhand, itemstack, enumdirection, f, f1, f2); + return super.interact(world, blockposition, iblockdata, entityhuman, enumhand, enumdirection, f, f1, f2); } - private void interact(World world, BlockPosition blockposition) { @@ -63,7 +63,7 @@ world.setTypeUpdate(blockposition, Blocks.LIT_REDSTONE_ORE.getBlockData()); } -@@ -45,6 +72,11 @@ +@@ -44,6 +71,11 @@ public void b(World world, BlockPosition blockposition, IBlockData iblockdata, Random random) { if (this == Blocks.LIT_REDSTONE_ORE) { @@ -75,7 +75,7 @@ world.setTypeUpdate(blockposition, Blocks.REDSTONE_ORE.getBlockData()); } -@@ -65,12 +97,25 @@ +@@ -63,12 +95,25 @@ public void dropNaturally(World world, BlockPosition blockposition, IBlockData iblockdata, float f, int i) { super.dropNaturally(world, blockposition, iblockdata, f, i); |