mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-21 07:09:21 +08:00
58 lines
2.4 KiB
Diff
58 lines
2.4 KiB
Diff
From 54752e418a3c9ecd8f3408f94297ba76b3c9acbb Mon Sep 17 00:00:00 2001
|
|
From: md_5 <md_5@live.com.au>
|
|
Date: Mon, 4 Mar 2013 18:45:52 +1100
|
|
Subject: [PATCH] PlayerItemDamageEvent
|
|
|
|
---
|
|
src/main/java/net/minecraft/server/ItemStack.java | 19 +++++++++++++++++--
|
|
1 files changed, 17 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
|
|
index 7dc36a8..cd032ae 100644
|
|
--- a/src/main/java/net/minecraft/server/ItemStack.java
|
|
+++ b/src/main/java/net/minecraft/server/ItemStack.java
|
|
@@ -178,7 +178,13 @@ public final class ItemStack {
|
|
return Item.byId[this.id].getMaxDurability();
|
|
}
|
|
|
|
+ // Spigot start
|
|
public boolean isDamaged(int i, Random random) {
|
|
+ return isDamaged(i, random, null);
|
|
+ }
|
|
+
|
|
+ public boolean isDamaged(int i, Random random, EntityLiving entityliving) {
|
|
+ // Spigot end
|
|
if (!this.g()) {
|
|
return false;
|
|
} else {
|
|
@@ -193,7 +199,16 @@ public final class ItemStack {
|
|
}
|
|
|
|
i -= k;
|
|
- if (i <= 0) {
|
|
+ // Spigot start
|
|
+ if (entityliving instanceof EntityPlayer) {
|
|
+ org.bukkit.craftbukkit.inventory.CraftItemStack item = org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(this);
|
|
+ org.bukkit.event.player.PlayerItemDamageEvent event = new org.bukkit.event.player.PlayerItemDamageEvent((org.bukkit.entity.Player) entityliving.getBukkitEntity(), item, i);
|
|
+ org.bukkit.Bukkit.getServer().getPluginManager().callEvent(event);
|
|
+ if (event.isCancelled()) return false;
|
|
+ i = event.getDamage();
|
|
+ }
|
|
+ // Spigot end
|
|
+ if (i <= 0 ) {
|
|
return false;
|
|
}
|
|
}
|
|
@@ -206,7 +221,7 @@ public final class ItemStack {
|
|
public void damage(int i, EntityLiving entityliving) {
|
|
if (!(entityliving instanceof EntityHuman) || !((EntityHuman) entityliving).abilities.canInstantlyBuild) {
|
|
if (this.g()) {
|
|
- if (this.isDamaged(i, entityliving.aE())) {
|
|
+ if (this.isDamaged(i, entityliving.aE(), entityliving)) {
|
|
entityliving.a(this);
|
|
if (entityliving instanceof EntityHuman) {
|
|
((EntityHuman) entityliving).a(StatisticList.F[this.id], 1);
|
|
--
|
|
1.7.0.4
|
|
|