diff options
Diffstat (limited to 'nms-patches/EntityLiving.patch')
| -rw-r--r-- | nms-patches/EntityLiving.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/nms-patches/EntityLiving.patch b/nms-patches/EntityLiving.patch index 84f0863c..cd95acf5 100644 --- a/nms-patches/EntityLiving.patch +++ b/nms-patches/EntityLiving.patch @@ -99,7 +99,7 @@ @@ -274,19 +323,19 @@ - protected void bM() { + protected void bO() { ++this.deathTicks; - if (this.deathTicks == 20) { + if (this.deathTicks >= 20 && !this.dead) { // CraftBukkit - (this.deathTicks == 20) -> (this.deathTicks >= 20 && !this.dead) @@ -587,12 +587,12 @@ + return this.isAlive() && !this.m_() && this.collides; // CraftBukkit } - protected void av() { + protected void ax() { @@ -2072,7 +2357,27 @@ protected void v() { if (!this.activeItem.isEmpty() && this.isHandRaised()) { this.b(this.activeItem, 16); -- this.a(this.cF(), this.activeItem.a(this.world, this)); +- this.a(this.cH(), this.activeItem.a(this.world, this)); + // CraftBukkit start - fire PlayerItemConsumeEvent + ItemStack itemstack; + if (this instanceof EntityPlayer) { @@ -612,9 +612,9 @@ + itemstack = this.activeItem.a(this.world, this); + } + -+ this.a(this.cF(), itemstack); ++ this.a(this.cH(), itemstack); + // CraftBukkit end - this.cL(); + this.cN(); } @@ -2151,10 +2456,18 @@ |