mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-22 02:25:28 +01:00
30 lines
1.7 KiB
Diff
30 lines
1.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Newwind <support@newwindserver.com>
|
|
Date: Mon, 26 Aug 2024 14:01:37 +0200
|
|
Subject: [PATCH] Check dead flag in isAlive()
|
|
|
|
If a plugin sets the health of a living entity above 0 after it has already died, the entity will be "revived".
|
|
It will behave the exact same as before, except with the internal "dead" flag set, resulting in 2 behavior changes,
|
|
A: it's completely invulnerable to all damage
|
|
B: it's unable to pickup items
|
|
|
|
isValid() for these bugged entities will return true, isDead() will return false, despite the dead flag.
|
|
This patch checks that the mob isn't dead before saying its alive.
|
|
|
|
Also, even if the plugin is responsibly checking !isDead() before modifying health, on very rare circumstances
|
|
I am currently unable to replicate, these "revived" entities can still appear
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
index 2edb4a4a7638f7bea2d50fa3ce8a5d9916c90a26..4d75ce205d5a0d61780936aa522710f5f753b271 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
@@ -2145,7 +2145,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
|
|
|
|
@Override
|
|
public boolean isAlive() {
|
|
- return !this.isRemoved() && this.getHealth() > 0.0F;
|
|
+ return !this.isRemoved() && this.getHealth() > 0.0F && !this.dead; // Paper - Check this.dead
|
|
}
|
|
|
|
public boolean isLookingAtMe(LivingEntity entity, double d0, boolean flag, boolean visualShape, Predicate<LivingEntity> predicate, DoubleSupplier... entityYChecks) {
|