2015-04-09 03:41:04 +00:00
|
|
|
From 6017e565a2dd5505bbf9e8370b28819961b24ae5 Mon Sep 17 00:00:00 2001
|
2014-07-21 20:46:54 +00:00
|
|
|
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-03-16 10:19:21 +00:00
|
|
|
index b966307..4976174 100644
|
2014-07-21 20:46:54 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/ItemStack.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/ItemStack.java
|
2015-03-16 10:19:21 +00:00
|
|
|
@@ -330,6 +330,11 @@ public final class ItemStack {
|
2014-07-21 20:46:54 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
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()) {
|
2014-07-21 20:46:54 +00:00
|
|
|
return false;
|
|
|
|
} else {
|
2015-03-16 10:19:21 +00:00
|
|
|
@@ -344,7 +349,16 @@ public final class ItemStack {
|
2014-07-21 20:46:54 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
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-03-16 10:19:21 +00:00
|
|
|
@@ -357,7 +371,7 @@ public final class ItemStack {
|
2014-07-27 19:14:24 +00:00
|
|
|
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);
|
2014-07-27 19:14:24 +00:00
|
|
|
--this.count;
|
|
|
|
if (entityliving instanceof EntityHuman) {
|
2014-07-21 20:46:54 +00:00
|
|
|
--
|
2014-11-28 01:17:45 +00:00
|
|
|
2.1.0
|
2014-07-21 20:46:54 +00:00
|
|
|
|