mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix EntityDeathEvent cancellation (#9323)

Browse source
This commit is contained in:
Lulu13022002 2023-06-12 19:03:51 +02:00 • committed by GitHub
parent f4dfdcbb5b
commit eb0693fff7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 65 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

8
patches/server/0322-Prevent-consuming-the-wrong-itemstack.patch
View file

@ -5,10 +5,10 @@ Subject: [PATCH] Prevent consuming the wrong itemstack
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 088a0944793032eb1dc499e0c9255f3738aefc98..a897ed99e7a643244fbe6f0ba1afc1bc15bb8d8d 100644
index 232e50c36e4c6dc719cc0e07cbe8ec0fd54fee6d..901ac163042322de70d008634cb2a99227bbf6e3 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -3658,9 +3658,14 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3661,9 +3661,14 @@ public abstract class LivingEntity extends Entity implements Attackable {
}
public void startUsingItem(InteractionHand hand) {
@ -24,7 +24,7 @@ index 088a0944793032eb1dc499e0c9255f3738aefc98..a897ed99e7a643244fbe6f0ba1afc1bc
this.useItem = itemstack;
this.useItemRemaining = itemstack.getUseDuration();
if (!this.level().isClientSide) {
@@ -3740,6 +3745,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3743,6 +3748,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.releaseUsingItem();
} else {
if (!this.useItem.isEmpty() && this.isUsingItem()) {
@ -32,7 +32,7 @@ index 088a0944793032eb1dc499e0c9255f3738aefc98..a897ed99e7a643244fbe6f0ba1afc1bc
this.triggerItemUseEffects(this.useItem, 16);
// CraftBukkit start - fire PlayerItemConsumeEvent
ItemStack itemstack;
@@ -3774,8 +3780,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3777,8 +3783,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
}
this.stopUsingItem();