Lukas A / CraftBukkit / a65e45d889c

Commits

md_5 authored a65e45d889c 06 Jun 2015

[SPIGOT-946] Begin making use of access transforms to simplify patching.

Modified

-1
+--- a/net/minecraft/server/BlockDispenser.java
-2
++++ b/net/minecraft/server/BlockDispenser.java
-3
+@@ -8,6 +8,7 @@
-4
+     public static final BlockStateBoolean TRIGGERED = BlockStateBoolean.of("triggered");
-5
+     public static final RegistryDefault<Item, IDispenseBehavior> N = new RegistryDefault(new DispenseBehaviorItem());
-6
+     protected Random O = new Random();
-7
++    public static boolean eventFired = false; // CraftBukkit
-8
-9
+     protected BlockDispenser() {
-10
+         super(Material.STONE);
--
+@@ -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();
--
-11
+@@ -83,6 +84,7 @@
-12
-13
+                 if (idispensebehavior != IDispenseBehavior.a) {
-14
+                     ItemStack itemstack1 = idispensebehavior.a(sourceblock, itemstack);
-15
++                    eventFired = false; // CraftBukkit - reset event status
-16
-17
+                     tileentitydispenser.setItem(i, itemstack1.count <= 0 ? null : itemstack1);
-18
+                 }