summaryrefslogtreecommitdiffstats
path: root/nms-patches/BlockDispenser.patch
diff options
context:
space:
mode:
Diffstat (limited to 'nms-patches/BlockDispenser.patch')
-rw-r--r--nms-patches/BlockDispenser.patch19
1 files changed, 14 insertions, 5 deletions
diff --git a/nms-patches/BlockDispenser.patch b/nms-patches/BlockDispenser.patch
index 1c484cfe..9cc5c12a 100644
--- a/nms-patches/BlockDispenser.patch
+++ b/nms-patches/BlockDispenser.patch
@@ -1,14 +1,23 @@
---- ../work/decompile-8eb82bde//net/minecraft/server/BlockDispenser.java 2014-11-28 17:43:42.893707440 +0000
-+++ src/main/java/net/minecraft/server/BlockDispenser.java 2014-11-28 17:38:18.000000000 +0000
+--- /home/matt/mc-dev-private//net/minecraft/server/BlockDispenser.java 2015-02-26 22:40:22.103608145 +0000
++++ src/main/java/net/minecraft/server/BlockDispenser.java 2015-02-26 22:40:22.103608145 +0000
@@ -8,6 +8,7 @@
public static final BlockStateBoolean TRIGGERED = BlockStateBoolean.of("triggered");
- public static final RegistryDefault M = new RegistryDefault(new DispenseBehaviorItem());
- protected Random N = new Random();
+ public static final RegistryDefault<Item, IDispenseBehavior> N = new RegistryDefault(new DispenseBehaviorItem());
+ protected Random O = new Random();
+ public static boolean eventFired = false; // CraftBukkit
protected BlockDispenser() {
super(Material.STONE);
-@@ -78,6 +79,7 @@
+@@ -68,7 +69,7 @@
+ }
+ }
+
+- protected void dispense(World world, BlockPosition blockposition) {
++ public void dispense(World world, BlockPosition blockposition) { // CraftBukkit - public
+ SourceBlock sourceblock = new SourceBlock(world, blockposition);
+ TileEntityDispenser tileentitydispenser = (TileEntityDispenser) sourceblock.getTileEntity();
+
+@@ -83,6 +84,7 @@
if (idispensebehavior != IDispenseBehavior.a) {
ItemStack itemstack1 = idispensebehavior.a(sourceblock, itemstack);