2021-06-11 12:02:28 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Aikar <aikar@aikar.co>
|
|
|
|
Date: Sun, 27 Sep 2015 01:18:02 -0400
|
|
|
|
Subject: [PATCH] handle NaN health/absorb values and repair bad data
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
2022-09-12 11:31:45 +00:00
|
|
|
index 5678461976a07f9afecccb1d34ea3eec24fba80e..8dc6fbbdfaecf0eb38a876d87d77f111541f766d 100644
|
2021-06-11 12:02:28 +00:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
2022-06-07 19:55:39 +00:00
|
|
|
@@ -784,7 +784,13 @@ public abstract class LivingEntity extends Entity {
|
2021-06-11 12:02:28 +00:00
|
|
|
|
|
|
|
@Override
|
2021-06-12 00:57:04 +00:00
|
|
|
public void readAdditionalSaveData(CompoundTag nbt) {
|
|
|
|
- this.setAbsorptionAmount(nbt.getFloat("AbsorptionAmount"));
|
2021-06-11 12:02:28 +00:00
|
|
|
+ // Paper start - jvm keeps optimizing the setter
|
2021-06-12 00:57:04 +00:00
|
|
|
+ float absorptionAmount = nbt.getFloat("AbsorptionAmount");
|
2021-06-11 12:02:28 +00:00
|
|
|
+ if (Float.isNaN(absorptionAmount)) {
|
|
|
|
+ absorptionAmount = 0;
|
|
|
|
+ }
|
|
|
|
+ this.setAbsorptionAmount(absorptionAmount);
|
|
|
|
+ // Paper end
|
2021-06-12 00:57:04 +00:00
|
|
|
if (nbt.contains("Attributes", 9) && this.level != null && !this.level.isClientSide) {
|
|
|
|
this.getAttributes().load(nbt.getList("Attributes", 10));
|
2021-06-11 12:02:28 +00:00
|
|
|
}
|
2022-06-07 19:55:39 +00:00
|
|
|
@@ -1271,6 +1277,10 @@ public abstract class LivingEntity extends Entity {
|
2021-06-11 12:02:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
public void setHealth(float health) {
|
|
|
|
+ // Paper start
|
|
|
|
+ if (Float.isNaN(health)) { health = getMaxHealth(); if (this.valid) {
|
|
|
|
+ System.err.println("[NAN-HEALTH] " + getScoreboardName() + " had NaN health set");
|
|
|
|
+ } } // Paper end
|
|
|
|
// CraftBukkit start - Handle scaled health
|
|
|
|
if (this instanceof ServerPlayer) {
|
|
|
|
org.bukkit.craftbukkit.entity.CraftPlayer player = ((ServerPlayer) this).getBukkitEntity();
|
2022-09-12 11:31:45 +00:00
|
|
|
@@ -3444,7 +3454,7 @@ public abstract class LivingEntity extends Entity {
|
2021-06-11 12:02:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
public void setAbsorptionAmount(float amount) {
|
|
|
|
- if (amount < 0.0F) {
|
|
|
|
+ if (amount < 0.0F || Float.isNaN(amount)) { // Paper
|
|
|
|
amount = 0.0F;
|
|
|
|
}
|
|
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
2022-09-01 16:51:59 +00:00
|
|
|
index 6ae934c6c7c50dd38ff2e762fddfe650e97aa4ae..da91150f7462c2743d7394b148ddb52e9af8b797 100644
|
2021-06-11 12:02:28 +00:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
2022-07-28 02:07:26 +00:00
|
|
|
@@ -1932,6 +1932,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
2021-06-11 12:02:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
public void setRealHealth(double health) {
|
|
|
|
+ if (Double.isNaN(health)) {return;} // Paper
|
|
|
|
this.health = health;
|
|
|
|
}
|
|
|
|
|