Paper/nms-patches/BlockDispenser.patch

28 lines
1.3 KiB
Diff
Raw Normal View History

2015-05-05 22:43:47 +02:00
--- /home/matt/mc-dev-private//net/minecraft/server/BlockDispenser.java 2015-05-05 21:41:19.972649179 +0100
+++ src/main/java/net/minecraft/server/BlockDispenser.java 2015-05-05 21:41:19.976649120 +0100
@@ -8,6 +8,7 @@
public static final BlockStateBoolean TRIGGERED = BlockStateBoolean.of("triggered");
2015-02-26 23:41:06 +01:00
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);
2015-02-26 23:41:06 +01:00
@@ -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);
+ eventFired = false; // CraftBukkit - reset event status
2015-05-05 22:43:47 +02:00
tileentitydispenser.setItem(i, itemstack1.count <= 0 ? null : itemstack1);
}