Spigot / CraftBukkit / 9af379fc474

Commits

Ryan Michela authored and md_5 committed 9af379fc474 19 Jun 2016

SPIGOT-1319: Add EntityBreedEvent

Modified

-1
+--- a/net/minecraft/server/EntityAnimal.java
-2
++++ b/net/minecraft/server/EntityAnimal.java
--
+@@ -40,6 +40,9 @@
-+
+@@ -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 @@
-12
-13
+     }
-14
-15
++    /* CraftBukkit start
-16
++    // Function disabled as it has no special function anymore after
-17
++    // setSitting is disabled.
-18
+     public boolean damageEntity(DamageSource damagesource, float f) {
-19
+         if (this.isInvulnerable(damagesource)) {
-20
+             return false;
--
+@@ -48,6 +51,7 @@
-+
+@@ -48,6 +52,7 @@
-22
+             return super.damageEntity(damagesource, f);
-23
+         }
-24
+     }
-25
++    // CraftBukkit end */
-26
-27
+     public float a(BlockPosition blockposition) {
-28
+         return this.world.getType(blockposition.down()).getBlock() == Blocks.GRASS ? 10.0F : this.world.n(blockposition) - 0.5F;
-+
+@@ -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);
-+
+     }
-+