testserver/CraftBukkit-Patches/0016-PlayerItemDamageEvent....

53 lines
2.2 KiB
Diff
Raw Normal View History

2015-07-10 12:33:16 +00:00
From 91a207cf310c507636fec4e119b0c4b55c3a0724 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
2015-07-10 12:33:16 +00:00
index 2821afa..b722be5 100644
--- a/src/main/java/net/minecraft/server/ItemStack.java
+++ b/src/main/java/net/minecraft/server/ItemStack.java
2015-07-10 12:33:16 +00:00
@@ -339,6 +339,11 @@ public final class ItemStack {
}
public boolean isDamaged(int i, Random random) {
+ return isDamaged(i, random, null);
+ }
+
+ public boolean isDamaged(int i, Random random, EntityLiving entityliving) {
+ // Spigot end
2014-11-28 01:17:45 +00:00
if (!this.e()) {
return false;
} else {
2015-07-10 12:33:16 +00:00
@@ -353,7 +358,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;
}
}
2015-07-10 12:33:16 +00:00
@@ -366,7 +380,7 @@ public final class ItemStack {
public void damage(int i, EntityLiving entityliving) {
if (!(entityliving instanceof EntityHuman) || !((EntityHuman) entityliving).abilities.canInstantlyBuild) {
2014-11-28 01:17:45 +00:00
if (this.e()) {
2015-02-28 11:36:22 +00:00
- if (this.isDamaged(i, entityliving.bc())) {
+ if (this.isDamaged(i, entityliving.bc(), entityliving)) { // Spigot
2014-11-28 01:17:45 +00:00
entityliving.b(this);
--this.count;
if (entityliving instanceof EntityHuman) {
--
2015-05-09 20:23:26 +00:00
2.1.4