Paper/nms-patches/EntityAnimal.patch

37 lines
1.2 KiB
Diff
Raw Normal View History

2015-05-25 12:37:24 +02:00
--- a/net/minecraft/server/EntityAnimal.java
+++ b/net/minecraft/server/EntityAnimal.java
2016-06-19 07:00:39 +02:00
@@ -7,6 +7,7 @@
protected Block bA;
private int bx;
private EntityHuman by;
+ public ItemStack breedItem; // CraftBukkit - Add breedItem variable
public EntityAnimal(World world) {
super(world);
@@ -40,6 +41,9 @@
}
+ /* CraftBukkit start
+ // Function disabled as it has no special function anymore after
+ // setSitting is disabled.
public boolean damageEntity(DamageSource damagesource, float f) {
if (this.isInvulnerable(damagesource)) {
return false;
2016-06-19 07:00:39 +02:00
@@ -48,6 +52,7 @@
return super.damageEntity(damagesource, f);
}
}
+ // CraftBukkit end */
public float a(BlockPosition blockposition) {
2016-02-29 22:32:46 +01:00
return this.world.getType(blockposition.down()).getBlock() == Blocks.GRASS ? 10.0F : this.world.n(blockposition) - 0.5F;
2016-06-19 07:00:39 +02:00
@@ -120,6 +125,7 @@
public void c(EntityHuman entityhuman) {
this.bx = 600;
this.by = entityhuman;
+ this.breedItem = entityhuman.inventory.getItemInHand(); // CraftBukkit
this.world.broadcastEntityEffect(this, (byte) 18);
}