Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-15 04:20:04 +01:00
Fix isDamaged check for backwards compat
Dieser Commit ist enthalten in:
Ursprung
75f3e084ad
Commit
184d1801e6
@ -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>
|
||||
Date: Mon, 4 Mar 2013 18:45:52 +1100
|
||||
Subject: [PATCH] PlayerItemDamageEvent
|
||||
|
||||
---
|
||||
src/main/java/net/minecraft/server/ItemStack.java | 15 ++++++++++++---
|
||||
1 file changed, 12 insertions(+), 3 deletions(-)
|
||||
src/main/java/net/minecraft/server/ItemStack.java | 19 +++++++++++++++++--
|
||||
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
|
||||
index cd6dd07..b8c845e 100644
|
||||
index cd6dd07..303d11c 100644
|
||||
--- a/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();
|
||||
}
|
||||
|
||||
- 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) {
|
||||
+ // Spigot end
|
||||
if (!this.g()) {
|
||||
return false;
|
||||
} else {
|
||||
@@ -174,7 +174,16 @@ public final class ItemStack {
|
||||
@@ -174,7 +180,16 @@ public final class ItemStack {
|
||||
}
|
||||
|
||||
i -= k;
|
||||
@ -38,7 +43,7 @@ index cd6dd07..b8c845e 100644
|
||||
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) {
|
||||
if (!(entityliving instanceof EntityHuman) || !((EntityHuman) entityliving).abilities.canInstantlyBuild) {
|
||||
if (this.g()) {
|
||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren