mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-25 18:37:35 +01:00
70ff1ec079
Only skip the damage tick logic on player entities if the original damage was zero and was not modified by plugins down the line. This way all the following three scenarios trigger the damage tick a) vanilla damage was 0, plugin set it to non zero b) vanilla damage was non zero, plugin did not modify it c) vanilla damage was non zero, plugin set it to zero. Regarding case c, the argument here is that EntityDamageEvent#setDamage should not modify the damage tick logic.
51 lines
2.9 KiB
Diff
51 lines
2.9 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..7b019553d88a4294fad1107c5f28ba3fff985d63 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
@@ -1425,7 +1425,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
|
|
}
|
|
|
|
this.noActionTime = 0;
|
|
- float f1 = amount;
|
|
+ float f1 = amount; final float originalAmount = f1; // Paper - revert to vanilla #hurt - OBFHELPER
|
|
boolean flag = amount > 0.0F && this.isDamageSourceBlocked(source); // Copied from below
|
|
float f2 = 0.0F;
|
|
|
|
@@ -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 && originalAmount == 0) return false; // Paper - revert to vanilla damage - players are not affected by damage that is 0 - skip damage if the vanilla damage is 0 and was not modified by plugins in the event.
|
|
// 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 && originalAmount == 0) return false; // Paper - revert to vanilla damage - players are not affected by damage that is 0 - skip damage if the vanilla damage is 0 and was not modified by plugins in the event.
|
|
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() {
|