From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Jake Potrebic Date: Sat, 27 Apr 2024 09:44:53 -0700 Subject: [PATCH] Revert to vanilla handling of LivingEntity#actuallyHurt diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java index a1a72712e9acd4023c4b6832e5ec09dcc3676b6e..ef0f118aecf0893e45cb9423a677d7e42496324b 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -2226,7 +2226,7 @@ public abstract class LivingEntity extends Entity implements Attackable { } // CraftBukkit start - protected boolean actuallyHurt(final DamageSource damagesource, float f) { // void -> boolean, add final + protected boolean actuallyHurt(final DamageSource damagesource, float f) { // void -> boolean, add final // Paper - return false ONLY if event cancelled if (!this.isInvulnerableTo(damagesource)) { final boolean human = this instanceof net.minecraft.world.entity.player.Player; float originalDamage = f; @@ -2398,12 +2398,12 @@ public abstract class LivingEntity extends Entity implements Attackable { return true; } else { - return originalDamage >= 0; + return true; // Paper - return false ONLY if event was cancelled } // CraftBukkit end } } - return false; // CraftBukkit + return true; // CraftBukkit // Paper - return false ONLY if event was cancelled } public CombatTracker getCombatTracker() {