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

Fix entity death sounds

Browse source
This commit is contained in:
KennyTV 2021-06-16 22:17:53 +02:00
parent 8e187cb187
commit 3d81d4e5b2
No known key found for this signature in database
GPG key ID: 6BE3B555EBC5982B
13 changed files with 36 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

8
patches/server/0344-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 ddb0a2f4d2894bd416d4b4b8d9cf1538705d104c..01546bc3e79e1f69385d070ce97f047c670ab926 100644
index 32507c52d90393101ef5140de0d82518e5cbfbcc..53951f2c4dc77e9723d0a6314781d9ee0aa8ce54 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -3547,15 +3547,18 @@ public abstract class LivingEntity extends Entity {
@@ -3548,15 +3548,18 @@ public abstract class LivingEntity extends Entity {
this.entityData.set(LivingEntity.DATA_LIVING_ENTITY_FLAGS, (byte) j);
}
@ -31,7 +31,7 @@ index ddb0a2f4d2894bd416d4b4b8d9cf1538705d104c..01546bc3e79e1f69385d070ce97f047c
}
}
@@ -3628,6 +3631,7 @@ public abstract class LivingEntity extends Entity {
@@ -3629,6 +3632,7 @@ public abstract class LivingEntity extends Entity {
this.releaseUsingItem();
} else {
if (!this.useItem.isEmpty() && this.isUsingItem()) {
@ -39,7 +39,7 @@ index ddb0a2f4d2894bd416d4b4b8d9cf1538705d104c..01546bc3e79e1f69385d070ce97f047c
this.triggerItemUseEffects(this.useItem, 16);
// CraftBukkit start - fire PlayerItemConsumeEvent
ItemStack itemstack;
@@ -3662,8 +3666,8 @@ public abstract class LivingEntity extends Entity {
@@ -3663,8 +3667,8 @@ public abstract class LivingEntity extends Entity {
}
this.stopUsingItem();