58 lines
2.6 KiB
Diff
58 lines
2.6 KiB
Diff
|
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
|
||
|
|
index 3c707ca6b56e89b671db6316d4db90a2903f33b4..a326e5b4ac055f2f8a95c6eaccd8d0a97762da1f 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||
|
|
@@ -699,7 +699,13 @@ public abstract class LivingEntity extends Entity {
|
||
|
|
|
||
|
|
@Override
|
||
|
|
public void readAdditionalSaveData(CompoundTag tag) {
|
||
|
|
- this.setAbsorptionAmount(tag.getFloat("AbsorptionAmount"));
|
||
|
|
+ // Paper start - jvm keeps optimizing the setter
|
||
|
|
+ float absorptionAmount = tag.getFloat("AbsorptionAmount");
|
||
|
|
+ if (Float.isNaN(absorptionAmount)) {
|
||
|
|
+ absorptionAmount = 0;
|
||
|
|
+ }
|
||
|
|
+ this.setAbsorptionAmount(absorptionAmount);
|
||
|
|
+ // Paper end
|
||
|
|
if (tag.contains("Attributes", 9) && this.level != null && !this.level.isClientSide) {
|
||
|
|
this.getAttributes().load(tag.getList("Attributes", 10));
|
||
|
|
}
|
||
|
|
@@ -1148,6 +1154,10 @@ public abstract class LivingEntity extends Entity {
|
||
|
|
}
|
||
|
|
|
||
|
|
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();
|
||
|
|
@@ -3042,7 +3052,7 @@ public abstract class LivingEntity extends Entity {
|
||
|
|
}
|
||
|
|
|
||
|
|
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
|
||
|
|
index dd29038778d73fae84df360515f3c670915f1d48..b7d5a718375083a4162df4bb41de3acd57b297fb 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||
|
|
@@ -1678,6 +1678,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||
|
|
}
|
||
|
|
|
||
|
|
public void setRealHealth(double health) {
|
||
|
|
+ if (Double.isNaN(health)) {return;} // Paper
|
||
|
|
this.health = health;
|
||
|
|
}
|
||
|
|
|