mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-22 23:29:32 +01:00
50 lines
2.9 KiB
Diff
50 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 1b9f03dcf63c44c11e79022cb6cce5f6bd1ea30a..6f9c4a5a87bdfb8ce32ce40c4a34997695d15ce3 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
@@ -1457,7 +1457,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
|
|
amount = 0.0F;
|
|
}
|
|
|
|
- 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;
|
|
|
|
@@ -1515,6 +1515,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
|
|
if (!this.actuallyHurt(world, 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;
|
|
@@ -1523,6 +1524,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
|
|
if (!this.actuallyHurt(world, 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(worldserver, damagesource, f);
|
|
@@ -2488,12 +2490,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() {
|