2024-09-07 00:06:32 +02:00
|
|
|
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
|
Rework async chunk api implementation
Firstly, the old methods all routed to the CompletableFuture method.
However, the CF method could not guarantee that if the caller
was off-main that the future would be "completed" on-main. Since
the callback methods used the CF one, this meant that the callback
methods did not guarantee that the callbacks were to be called on
the main thread.
Now, all methods route to getChunkAtAsync(x, z, gen, urgent, cb)
so that the methods with the callback are guaranteed to invoke
the callback on the main thread. The CF behavior remains unchanged;
it may still appear to complete on main if invoked off-main.
Secondly, remove the scheduleOnMain invocation in the async
chunk completion. This unnecessarily delays the callback
by 1 tick.
Thirdly, add getChunksAtAsync(minX, minZ, maxX, maxZ, ...) which
will load chunks within an area. This method is provided as a helper
as keeping all chunks loaded within an area can be complicated to
implement for plugins (due to the lacking ticket API), and is
already implemented internally anyways.
Fourthly, remove the ticket addition that occured with getChunkAt
and getChunkAtAsync. The ticket addition may delay the unloading
of the chunk unnecessarily. It also fixes a very rare timing bug
where the future/callback would be completed after the chunk
unloads.
2024-11-19 07:34:32 +01:00
|
|
|
index cfef1bff0080ffc662e3a4428116f7d4dc71eab2..f2708479ccf994278ad1ab4665edc46672001e8a 100644
|
2024-09-07 00:06:32 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
2024-10-27 18:11:15 +01:00
|
|
|
@@ -2145,7 +2145,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
|
2024-09-07 00:06:32 +02:00
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public boolean isAlive() {
|
|
|
|
|
- return !this.isRemoved() && this.getHealth() > 0.0F;
|
|
|
|
|
+ return !this.isRemoved() && this.getHealth() > 0.0F && !this.dead; // Paper - Check this.dead
|
|
|
|
|
}
|
|
|
|
|
|
2024-10-25 00:08:35 +02:00
|
|
|
public boolean isLookingAtMe(LivingEntity entity, double d0, boolean flag, boolean visualShape, Predicate<LivingEntity> predicate, DoubleSupplier... entityYChecks) {
|
