craftbukkit/nms-patches/net/minecraft/world/entity/animal/EntityCow.patch

33 lines
1.6 KiB
Diff
Raw Normal View History

2021-03-16 09:00:00 +11:00
--- a/net/minecraft/world/entity/animal/EntityCow.java
+++ b/net/minecraft/world/entity/animal/EntityCow.java
2022-12-08 03:00:00 +11:00
@@ -31,6 +31,11 @@
2021-03-16 09:00:00 +11:00
import net.minecraft.world.level.World;
import net.minecraft.world.level.block.state.IBlockData;
+// CraftBukkit start
+import org.bukkit.craftbukkit.event.CraftEventFactory;
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
+// CraftBukkit end
2019-04-23 12:00:00 +10:00
+
public class EntityCow extends EntityAnimal {
2019-04-23 12:00:00 +10:00
public EntityCow(EntityTypes<? extends EntityCow> entitytypes, World world) {
2022-12-08 03:00:00 +11:00
@@ -83,8 +88,16 @@
2021-11-22 09:00:00 +11:00
ItemStack itemstack = entityhuman.getItemInHand(enumhand);
2015-02-26 22:41:06 +00:00
2021-11-22 09:00:00 +11:00
if (itemstack.is(Items.BUCKET) && !this.isBaby()) {
+ // CraftBukkit start - Got milk?
+ org.bukkit.event.player.PlayerBucketFillEvent event = CraftEventFactory.callPlayerBucketFillEvent((WorldServer) entityhuman.level, entityhuman, this.blockPosition(), this.blockPosition(), null, itemstack, Items.MILK_BUCKET, enumhand);
+
+ if (event.isCancelled()) {
2020-06-25 10:00:00 +10:00
+ return EnumInteractionResult.PASS;
+ }
+ // CraftBukkit end
2020-06-25 10:00:00 +10:00
+
2021-06-11 15:00:00 +10:00
entityhuman.playSound(SoundEffects.COW_MILK, 1.0F, 1.0F);
2021-11-22 09:00:00 +11:00
- ItemStack itemstack1 = ItemLiquidUtil.createFilledResult(itemstack, entityhuman, Items.MILK_BUCKET.getDefaultInstance());
+ ItemStack itemstack1 = ItemLiquidUtil.createFilledResult(itemstack, entityhuman, CraftItemStack.asNMSCopy(event.getItemStack())); // CraftBukkit
2021-11-22 09:00:00 +11:00
entityhuman.setItemInHand(enumhand, itemstack1);
return EnumInteractionResult.sidedSuccess(this.level.isClientSide);