diff --git a/patches/server/Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch b/patches/server/Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch
index 200940471..c3aa0a716 100644
--- a/patches/server/Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch
+++ b/patches/server/Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch
@@ -9,15 +9,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -0,0 +0,0 @@ public abstract class LivingEntity extends Entity implements Attackable {
-                 }
- 
-                 // CraftBukkit start
--                if (!this.actuallyHurt(source, (float) event.getFinalDamage() - this.lastHurt, event)) {
-+                final float actualDamage = (float) event.getFinalDamage() - this.lastHurt; // Paper - revert to vanilla damage - move out for diff on change
-+                if (!this.actuallyHurt(source, actualDamage, event)) { // Paper - revert to vanilla damage - move out for diff on change
+                 if (!this.actuallyHurt(source, (float) event.getFinalDamage() - this.lastHurt, event)) {
                      return false;
                  }
-+                if (this instanceof ServerPlayer && actualDamage == 0.0F) return false; // Paper - revert to vanilla damage - players are not affected by damage that is 0.
++                if (this instanceof ServerPlayer && event.getDamage() == 0) return false; // Paper - revert to vanilla damage - players are not affected by damage that is 0 - use raw damage here, as it is just the original amount but post plugin changes to it.
                  // CraftBukkit end
                  this.lastHurt = amount;
                  flag1 = false;
@@ -25,7 +20,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                  if (!this.actuallyHurt(source, (float) event.getFinalDamage(), event)) {
                      return false;
                  }
-+                if (this instanceof ServerPlayer && event.getFinalDamage() == 0.0F) return false; // Paper - revert to vanilla damage - players are not affected by damage that is 0.
++                if (this instanceof ServerPlayer && event.getDamage() == 0) return false; // Paper - revert to vanilla damage - players are not affected by damage that is 0 - use raw damage here, as it is just the original amount but post plugin changes to it.
                  this.lastHurt = amount;
                  this.invulnerableTime = this.invulnerableDuration; // CraftBukkit - restore use of maxNoDamageTicks
                  // this.actuallyHurt(damagesource, f);