@@ -93,7 +93,7 @@
|
||||
|
||||
@@ -283,19 +335,19 @@
|
||||
|
||||
protected void ca() {
|
||||
protected void cb() {
|
||||
++this.deathTicks;
|
||||
- if (this.deathTicks == 20) {
|
||||
+ if (this.deathTicks >= 20 && !this.dead) { // CraftBukkit - (this.deathTicks == 20) -> (this.deathTicks >= 20 && !this.dead)
|
||||
@@ -280,7 +280,7 @@
|
||||
} else {
|
||||
return false;
|
||||
@@ -637,14 +779,40 @@
|
||||
public boolean co() {
|
||||
public boolean cp() {
|
||||
return this.getMonsterType() == EnumMonsterType.UNDEAD;
|
||||
}
|
||||
-
|
||||
@@ -734,7 +734,7 @@
|
||||
protected void q() {
|
||||
if (!this.activeItem.isEmpty() && this.isHandRaised()) {
|
||||
this.b(this.activeItem, 16);
|
||||
- this.a(this.cT(), this.activeItem.a(this.world, this));
|
||||
- this.a(this.cU(), this.activeItem.a(this.world, this));
|
||||
+ // CraftBukkit start - fire PlayerItemConsumeEvent
|
||||
+ ItemStack itemstack;
|
||||
+ if (this instanceof EntityPlayer) {
|
||||
@@ -754,9 +754,9 @@
|
||||
+ itemstack = this.activeItem.a(this.world, this);
|
||||
+ }
|
||||
+
|
||||
+ this.a(this.cT(), itemstack);
|
||||
+ this.a(this.cU(), itemstack);
|
||||
+ // CraftBukkit end
|
||||
this.cZ();
|
||||
this.da();
|
||||
}
|
||||
|
||||
@@ -2261,10 +2649,18 @@
|
||||
|
||||
Reference in New Issue
Block a user