Update for minor remapping changes.

1 files changed, 6 insertions, 6 deletions

diff --git a/nms-patches/DispenseBehaviorProjectile.patch b/nms-patches/DispenseBehaviorProjectile.patch
index 938d08ba..5cf558a8 100644
--- a/nms-patches/DispenseBehaviorProjectile.patch
+++ b/nms-patches/DispenseBehaviorProjectile.patch
@@ -15,10 +15,10 @@
          EnumDirection enumdirection = BlockDispenser.b(isourceblock.f());
          IProjectile iprojectile = this.a(world, iposition);
  
--        iprojectile.shoot((double) enumdirection.getAdjacentX(), (double) ((float) enumdirection.getAdjacentY() + 0.1F), (double) enumdirection.getAdjacentZ(), this.b(), this.a());
+-        iprojectile.shoot((double) enumdirection.getAdjacentX(), (double) ((float) enumdirection.getAdjacentY() + 0.1F), (double) enumdirection.getAdjacentZ(), this.getPower(), this.a());
 +        // iprojectile.shoot((double) enumdirection.getAdjacentX(), (double) ((float) enumdirection.getAdjacentY() + 0.1F), (double) enumdirection.getAdjacentZ(), this.b(), this.a());
 +        // CraftBukkit start
-+        ItemStack itemstack1 = itemstack.a(1);
++        ItemStack itemstack1 = itemstack.cloneAndSubtract(1);
 +        org.bukkit.block.Block block = world.getWorld().getBlockAt(isourceblock.getBlockPosition().getX(), isourceblock.getBlockPosition().getY(), isourceblock.getBlockPosition().getZ());
 +        CraftItemStack craftItem = CraftItemStack.asCraftMirror(itemstack1);
 +
@@ -36,18 +36,18 @@
 +            itemstack.count++;
 +            // Chain to handler for new item
 +            ItemStack eventStack = CraftItemStack.asNMSCopy(event.getItem());
-+            IDispenseBehavior idispensebehavior = (IDispenseBehavior) BlockDispenser.N.get(eventStack.getItem());
-+            if (idispensebehavior != IDispenseBehavior.a && idispensebehavior != this) {
++            IDispenseBehavior idispensebehavior = (IDispenseBehavior) BlockDispenser.REGISTRY.get(eventStack.getItem());
++            if (idispensebehavior != IDispenseBehavior.NONE && idispensebehavior != this) {
 +                idispensebehavior.a(isourceblock, eventStack);
 +                return itemstack;
 +            }
 +        }
 +
-+        iprojectile.shoot(event.getVelocity().getX(), event.getVelocity().getY(), event.getVelocity().getZ(), this.b(), this.a());
++        iprojectile.shoot(event.getVelocity().getX(), event.getVelocity().getY(), event.getVelocity().getZ(), this.getPower(), this.a());
 +        ((Entity) iprojectile).projectileSource = new org.bukkit.craftbukkit.projectiles.CraftBlockProjectileSource((TileEntityDispenser) isourceblock.getTileEntity());
 +        // CraftBukkit end
          world.addEntity((Entity) iprojectile);
--        itemstack.a(1);
+-        itemstack.cloneAndSubtract(1);
 +        // itemstack.a(1); // CraftBukkit - Handled during event processing
          return itemstack;
      }