summaryrefslogtreecommitdiffstats
path: root/nms-patches/EntityAnimal.patch
diff options
context:
space:
mode:
authorRyan Michela <deltahat@gmail.com>2016-06-18 22:00:39 -0700
committermd_5 <git@md-5.net>2016-06-19 20:14:09 +1000
commit9af379fc4741a6fb487aaf4b5c7ffdbcbb12ca4f (patch)
treef7bc7c89fd3ba17c6e6ecea676df2fd5a71b9437 /nms-patches/EntityAnimal.patch
parent63839165bc6923006d7a92b9b1fc5abc88dd9dfe (diff)
downloadcraftbukkit-9af379fc4741a6fb487aaf4b5c7ffdbcbb12ca4f.tar
craftbukkit-9af379fc4741a6fb487aaf4b5c7ffdbcbb12ca4f.tar.gz
craftbukkit-9af379fc4741a6fb487aaf4b5c7ffdbcbb12ca4f.tar.lz
craftbukkit-9af379fc4741a6fb487aaf4b5c7ffdbcbb12ca4f.tar.xz
craftbukkit-9af379fc4741a6fb487aaf4b5c7ffdbcbb12ca4f.zip
SPIGOT-1319: Add EntityBreedEvent
Diffstat (limited to 'nms-patches/EntityAnimal.patch')
-rw-r--r--nms-patches/EntityAnimal.patch20
1 files changed, 18 insertions, 2 deletions
diff --git a/nms-patches/EntityAnimal.patch b/nms-patches/EntityAnimal.patch
index aae4904d..03998da2 100644
--- a/nms-patches/EntityAnimal.patch
+++ b/nms-patches/EntityAnimal.patch
@@ -1,6 +1,14 @@
--- a/net/minecraft/server/EntityAnimal.java
+++ 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 @@
}
@@ -10,7 +18,7 @@
public boolean damageEntity(DamageSource damagesource, float f) {
if (this.isInvulnerable(damagesource)) {
return false;
-@@ -48,6 +51,7 @@
+@@ -48,6 +52,7 @@
return super.damageEntity(damagesource, f);
}
}
@@ -18,3 +26,11 @@
public float a(BlockPosition blockposition) {
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);
+ }
+