Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-22 08:57:35 +01:00
Code Issues Projects Releases Wiki Activity

Fix isDamaged check for backwards compat

Browse Source
This commit is contained in:
md_5 2013-03-16 11:57:39 +11:00
parent 75f3e084ad
commit 184d1801e6
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
CraftBukkit-Patches/0038-PlayerItemDamageEvent.patch
View File

@ -1,26 +1,31 @@
From cc1b0248bbf67e99b0862ae7ebbdd1415a288d04 Mon Sep 17 00:00:00 2001 From 724d6e5425b42a122cf2bde806674a327eadeefd Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au> From: md_5 <md_5@live.com.au>
Date: Mon, 4 Mar 2013 18:45:52 +1100 Date: Mon, 4 Mar 2013 18:45:52 +1100
Subject: [PATCH] PlayerItemDamageEvent Subject: [PATCH] PlayerItemDamageEvent
--- ---
src/main/java/net/minecraft/server/ItemStack.java | 15 ++++++++++++--- src/main/java/net/minecraft/server/ItemStack.java | 19 +++++++++++++++++--
1 file changed, 12 insertions(+), 3 deletions(-) 1 file 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 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
index cd6dd07..b8c845e 100644 index cd6dd07..303d11c 100644
--- a/src/main/java/net/minecraft/server/ItemStack.java --- a/src/main/java/net/minecraft/server/ItemStack.java
+++ b/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -159,7 +159,7 @@ public final class ItemStack { @@ -159,7 +159,13 @@ public final class ItemStack {
return Item.byId[this.id].getMaxDurability(); return Item.byId[this.id].getMaxDurability();
} }
- public boolean isDamaged(int i, Random random) { + // Spigot start
public boolean isDamaged(int i, Random random) {
+ return isDamaged(i, random, null);
+ }
+
+ public boolean isDamaged(int i, Random random, EntityLiving entityliving) { + public boolean isDamaged(int i, Random random, EntityLiving entityliving) {
+ // Spigot end
if (!this.g()) { if (!this.g()) {
return false; return false;
} else { } else {
@@ -174,7 +174,16 @@ public final class ItemStack { @@ -174,7 +180,16 @@ public final class ItemStack {
} }
i -= k; i -= k;
@ -38,7 +43,7 @@ index cd6dd07..b8c845e 100644
return false; return false;
} }
} }
@@ -187,7 +196,7 @@ public final class ItemStack { @@ -187,7 +202,7 @@ public final class ItemStack {
public void damage(int i, EntityLiving entityliving) { public void damage(int i, EntityLiving entityliving) {
if (!(entityliving instanceof EntityHuman) || !((EntityHuman) entityliving).abilities.canInstantlyBuild) { if (!(entityliving instanceof EntityHuman) || !((EntityHuman) entityliving).abilities.canInstantlyBuild) {
if (this.g()) { if (this.g()) {