46 lines
1.7 KiB
Diff
46 lines
1.7 KiB
Diff
|
From a7fee6f33394acc942799bac537e7e578fbf1791 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
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
|
||
|
|
index c9d74d3..05d7c4e 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/ItemStack.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/ItemStack.java
|
||
|
|
@@ -279,7 +279,13 @@ public final class ItemStack {
|
||
|
|
return this.item.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 {
|
||
|
|
@@ -294,7 +300,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;
|
||
|
|
}
|
||
|
|
}
|
||
|
|
--
|
||
|
|
1.9.1
|
||
|
|
|