3
0
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-12-28 00:50:08 +01:00
Paper/nms-patches/EntityCow.patch

41 Zeilen
1.7 KiB
Diff

2015-05-25 12:37:24 +02:00
--- a/net/minecraft/server/EntityCow.java
+++ b/net/minecraft/server/EntityCow.java
2016-05-10 13:47:39 +02:00
@@ -1,6 +1,10 @@
package net.minecraft.server;
2016-05-10 13:47:39 +02:00
import javax.annotation.Nullable;
+// CraftBukkit start
+import org.bukkit.craftbukkit.event.CraftEventFactory;
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
+// CraftBukkit end
2016-05-10 13:47:39 +02:00
public class EntityCow extends EntityAnimal {
2016-06-09 03:43:49 +02:00
@@ -57,12 +61,22 @@
2015-02-26 23:41:06 +01:00
2016-05-10 13:47:39 +02:00
public boolean a(EntityHuman entityhuman, EnumHand enumhand, @Nullable ItemStack itemstack) {
2015-02-26 23:41:06 +01:00
if (itemstack != null && itemstack.getItem() == Items.BUCKET && !entityhuman.abilities.canInstantlyBuild && !this.isBaby()) {
+ // CraftBukkit start - Got milk?
+ org.bukkit.Location loc = this.getBukkitEntity().getLocation();
+ org.bukkit.event.player.PlayerBucketFillEvent event = CraftEventFactory.callPlayerBucketFillEvent(entityhuman, loc.getBlockX(), loc.getBlockY(), loc.getBlockZ(), null, itemstack, Items.MILK_BUCKET);
+
+ if (event.isCancelled()) {
+ return false;
+ }
+
+ ItemStack result = CraftItemStack.asNMSCopy(event.getItemStack());
2016-02-29 22:32:46 +01:00
entityhuman.a(SoundEffects.ap, 1.0F, 1.0F);
- if (--itemstack.count == 0) {
- entityhuman.a(enumhand, new ItemStack(Items.MILK_BUCKET));
- } else if (!entityhuman.inventory.pickup(new ItemStack(Items.MILK_BUCKET))) {
- entityhuman.drop(new ItemStack(Items.MILK_BUCKET), false);
+ if (--itemstack.count <= 0) {
2016-02-29 22:32:46 +01:00
+ entityhuman.a(enumhand, result);
+ } else if (!entityhuman.inventory.pickup(result)) {
+ entityhuman.drop(result, false);
}
+ // CraftBukkit end
return true;
} else {