Skip to content

Kill entity and not remove for negative healing #13158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Kill entity and not remove for negative healing #13158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5503829
Kill entity and not remove for negative healing
Doc94 Oct 8, 2025
c6ba20c
Cat wanna DamageType but sure this needs more talk and possible confl…
Doc94 Oct 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions paper-server/patches/features/0005-Entity-Activation-Range-2.0.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,10 +523,10 @@ index 2cae59fbc6a279e70c388ea7cc6f6f5f749f46a1..8dcd36b3d29c3d9913675c918fa509d7
movement = this.maybeBackOffFromEdge(movement, type);
Vec3 vec3 = this.collide(movement);
diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
index d5e304c9431bf3d7ad151e68e955b113d3c599ef..90483699b3f2efe9945c849adfdd38422e3a3458 100644
index b49d5e2089ab7ae024cb8e5d9c040060e90a678a..2d4cd4c74921da4b91b96d1cbfc729e845a25a38 100644
--- a/net/minecraft/world/entity/LivingEntity.java
+++ b/net/minecraft/world/entity/LivingEntity.java
@@ -3246,6 +3246,14 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
@@ -3252,6 +3252,14 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
return false;
}

Expand Down
8 changes: 7 additions & 1 deletion paper-server/patches/sources/net/minecraft/world/entity/LivingEntity.java.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,7 @@
if (mobEffectInstance != null) {
this.onEffectsRemoved(List.of(mobEffectInstance));
return true;
@@ -1131,17 +_,62 @@
@@ -1131,17 +_,68 @@
}

public void heal(float healAmount) {
Expand All @@ -460,6 +460,12 @@
+ }
+
+ if (!event.isCancelled()) {
+ // Paper start - handle negative health
+ if (event.getAmount() < 0) {
+ this.hurtServer(((net.minecraft.server.level.ServerLevel) this.level()), new DamageSource(this.level().registryAccess().getOrThrow(ResourceKey.create(net.minecraft.core.registries.Registries.DAMAGE_TYPE, ResourceLocation.fromNamespaceAndPath("paper", "healing_magic")))), (float) Math.abs(event.getAmount()));
+ return;
+ }
+ // Paper end
+ this.setHealth((float) (this.getHealth() + event.getAmount()));
+ }
+ // CraftBukkit end
Expand Down
5 changes: 5 additions & 0 deletions ...c/main/resources/data/minecraft/datapacks/paper/data/paper/damage_type/healing_magic.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"exhaustion": 0.0,
"message_id": "generic",
"scaling": "when_caused_by_living_non_player"
}
6 changes: 6 additions & 0 deletions .../data/minecraft/datapacks/paper/data/paper/tags/damage_type/bypasses_invulnerability.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"paper:healing_magic"
]
}
6 changes: 6 additions & 0 deletions ...in/resources/data/minecraft/datapacks/paper/data/paper/tags/damage_type/no_knockback.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"paper:healing_magic"
]
}
Loading