diff options
Diffstat (limited to 'patches/server/0240-Improve-death-events.patch')
| -rw-r--r-- | patches/server/0240-Improve-death-events.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/server/0240-Improve-death-events.patch b/patches/server/0240-Improve-death-events.patch index c5edd99375..6dadb58ee5 100644 --- a/patches/server/0240-Improve-death-events.patch +++ b/patches/server/0240-Improve-death-events.patch @@ -19,7 +19,7 @@ public net.minecraft.world.entity.LivingEntity getDeathSound()Lnet/minecraft/sou public net.minecraft.world.entity.LivingEntity getSoundVolume()F diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 0a5aeb9b50dfec3b791040348f6a9e929ef8e59c..cec8e2b8867e348d8c92e76983211e29edd46ed1 100644 +index 0a5aeb9b50dfec3b791040348f6a9e929ef8e59c..6c3569435cdfcf28acaa7b2dac8664dd14e3e6c2 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -294,6 +294,10 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { @@ -65,7 +65,7 @@ index 0a5aeb9b50dfec3b791040348f6a9e929ef8e59c..cec8e2b8867e348d8c92e76983211e29 - return super.hurtServer(world, source, amount); + // Paper start - cancellable death events -+ //return super.hurt(world, source, amount); ++ // return super.hurtServer(world, source, amount); + this.queueHealthUpdatePacket = true; + boolean damaged = super.hurtServer(world, source, amount); + this.queueHealthUpdatePacket = false; |