SPIGOT-2930: Shift calling of PlayerItemBreakEvent to before break.

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot 2016-12-18 09:26:36 +11:00
parent 75f7baf1ad
commit 595c69ab7b

View File

@ -264,18 +264,18 @@
} }
public int k() { public int k() {
@@ -205,6 +392,11 @@ @@ -198,6 +385,11 @@
entityhuman.b(StatisticList.c(this.item)); if (this.f()) {
} if (this.isDamaged(i, entityliving.getRandom())) {
entityliving.b(this);
+ // CraftBukkit start - Check for item breaking + // CraftBukkit start - Check for item breaking
+ if (this.count == 0 && entityliving instanceof EntityHuman) { + if (this.count == 1 && entityliving instanceof EntityHuman) {
+ org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerItemBreakEvent((EntityHuman) entityliving, this); + org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerItemBreakEvent((EntityHuman) entityliving, this);
+ } + }
+ // CraftBukkit end + // CraftBukkit end
this.damage = 0; this.subtract(1);
} if (entityliving instanceof EntityHuman) {
EntityHuman entityhuman = (EntityHuman) entityliving;
@@ -509,6 +701,12 @@ @@ -509,6 +701,12 @@
nbttaglist.add(nbttagcompound); nbttaglist.add(nbttagcompound);
} }