From 79da41d557b1a59d6ff5e6ddf7c09533d4b4df6f Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Wed, 16 Jun 2021 22:17:53 +0200 Subject: [PATCH] Fix entity death sounds --- patches/server/Improve-death-events.patch | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/patches/server/Improve-death-events.patch b/patches/server/Improve-death-events.patch index 9d3691b0fc..89cbf20f03 100644 --- a/patches/server/Improve-death-events.patch +++ b/patches/server/Improve-death-events.patch @@ -194,14 +194,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 // CraftBukkit start public int getExpReward() { @@ -0,0 +0,0 @@ public abstract class LivingEntity extends Entity { + return SoundEvents.GENERIC_HURT; } ++ public SoundEvent getDeathSoundPublic() { return getDeathSound(); } // Paper - public OBFHELPER @Nullable -- protected SoundEvent getDeathSound() { -+ protected SoundEvent getDeathSound() { return getDeathSoundPublic(); } public SoundEvent getDeathSoundPublic() { // Paper - public OBFHELPER + protected SoundEvent getDeathSound() { return SoundEvents.GENERIC_DEATH; - } - diff --git a/src/main/java/net/minecraft/world/entity/animal/Fox.java b/src/main/java/net/minecraft/world/entity/animal/Fox.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/world/entity/animal/Fox.java