OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-30 16:19:03 +01:00
Code Issues Projects Releases Packages Wiki Activity

SPIGOT-7895: PlayerItemBreakEvent not firing

Browse source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot 2024-09-09 20:57:37 +10:00
parent deb7197a64
commit b7359583f2
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
paper-server/nms-patches/net/minecraft/world/item/ItemStack.patch
View file

@ -302,18 +302,18 @@
if (i <= 0) {
return;
}
@@ -480,6 +694,11 @@
}
@@ -458,6 +672,11 @@
this.setDamageValue(j);
if (j >= this.getMaxDamage()) {
Item item = this.getItem();
+ // CraftBukkit start - Check for item breaking
+ if (this.count == 1) {
+ org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerItemBreakEvent(entityplayer, this);
+ }
+ // CraftBukkit end
this.hurtAndBreak(i, worldserver, entityplayer, (item) -> {
+ // CraftBukkit start - Check for item breaking
+ if (this.count == 1 && entityliving instanceof EntityHuman) {
+ org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerItemBreakEvent((EntityHuman) entityliving, this);
+ }
+ // CraftBukkit end
entityliving.onEquippedItemBroken(item, enumitemslot);
});
}
this.shrink(1);
consumer.accept(item);
@@ -693,6 +912,12 @@
return this.getItem().useOnRelease(this);
}

4
paper-server/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
View file

@ -1365,9 +1365,9 @@ public class CraftEventFactory {
return event;
}
public static void callPlayerItemBreakEvent(EntityHuman human, ItemStack brokenItem) {
public static void callPlayerItemBreakEvent(EntityPlayer human, ItemStack brokenItem) {
CraftItemStack item = CraftItemStack.asCraftMirror(brokenItem);
PlayerItemBreakEvent event = new PlayerItemBreakEvent((Player) human.getBukkitEntity(), item);
PlayerItemBreakEvent event = new PlayerItemBreakEvent(human.getBukkitEntity(), item);
Bukkit.getPluginManager().callEvent(event);
}