Commits

Parker Hawke authored and md_5 committed 5329dd6fd24
#1107: Add getHand() to all relevant events
No tags

nms-patches/net/minecraft/world/entity/animal/goat/Goat.patch

Modified
19 19 - return super.getBrain();
20 20 + return (BehaviorController<Goat>) super.getBrain(); // CraftBukkit - decompile error
21 21 }
22 22
23 23 @Override
24 24 @@ -194,8 +199,15 @@
25 25 ItemStack itemstack = entityhuman.getItemInHand(enumhand);
26 26
27 27 if (itemstack.is(Items.BUCKET) && !this.isBaby()) {
28 28 + // CraftBukkit start - Got milk?
29 -+ org.bukkit.event.player.PlayerBucketFillEvent event = CraftEventFactory.callPlayerBucketFillEvent((WorldServer) entityhuman.level, entityhuman, this.blockPosition(), this.blockPosition(), null, itemstack, Items.MILK_BUCKET);
29 ++ org.bukkit.event.player.PlayerBucketFillEvent event = CraftEventFactory.callPlayerBucketFillEvent((WorldServer) entityhuman.level, entityhuman, this.blockPosition(), this.blockPosition(), null, itemstack, Items.MILK_BUCKET, enumhand);
30 30 +
31 31 + if (event.isCancelled()) {
32 32 + return EnumInteractionResult.PASS;
33 33 + }
34 34 + // CraftBukkit end
35 35 entityhuman.playSound(this.getMilkingSound(), 1.0F, 1.0F);
36 36 - ItemStack itemstack1 = ItemLiquidUtil.createFilledResult(itemstack, entityhuman, Items.MILK_BUCKET.getDefaultInstance());
37 37 + ItemStack itemstack1 = ItemLiquidUtil.createFilledResult(itemstack, entityhuman, CraftItemStack.asNMSCopy(event.getItemStack())); // CraftBukkit
38 38
39 39 entityhuman.setItemInHand(enumhand, itemstack1);
40 40 return EnumInteractionResult.sidedSuccess(this.level.isClientSide);

Everything looks good. We'll let you know here if there's anything you should know about.

Add shortcut