mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-22 10:35:38 +01:00
70b0e84476
The logic in place to prevent players from processing a damage tick/knockback/etc when hit with 0 damage incorrectly used the damage events final damage value, which is reduced by absorption. Instead, use the event's "raw damage", e.g. the amount passed to hurt, in order to determine if the damage tick should be skipped. This still allows plugins to change the damage to a non-zero value and properly damage ticks the player in such a case, but correctly processes the damage tick in cases where the original damage is non zero but the actual damage is.
42 lines
2.4 KiB
Diff
42 lines
2.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
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 8072d31525d9c7890804bb879893f1a69820e32d..c54cb799730353ba1d44c110c85455eb1da6b1d1 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
@@ -1479,6 +1479,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
|
|
if (!this.actuallyHurt(source, (float) event.getFinalDamage() - this.lastHurt, event)) {
|
|
return false;
|
|
}
|
|
+ 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;
|
|
@@ -1487,6 +1488,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
|
|
if (!this.actuallyHurt(source, (float) event.getFinalDamage(), event)) {
|
|
return false;
|
|
}
|
|
+ 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);
|
|
@@ -2411,12 +2413,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() {
|