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/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
|
||
|
|
index 759592fc6a4654c0760ff8a1d7f3b87c364b045a..375284b7e321cb03a7a30aedea165ca7a2fd1091 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
|
||
|
|
@@ -702,7 +702,13 @@ public abstract class EntityLiving extends Entity {
|
||
|
|
|
||
|
|
@Override
|
||
|
|
public void loadData(NBTTagCompound nbttagcompound) {
|
||
|
|
- this.setAbsorptionHearts(nbttagcompound.getFloat("AbsorptionAmount"));
|
||
|
|
+ // Paper start - jvm keeps optimizing the setter
|
||
|
|
+ float absorptionAmount = nbttagcompound.getFloat("AbsorptionAmount");
|
||
|
|
+ if (Float.isNaN(absorptionAmount)) {
|
||
|
|
+ absorptionAmount = 0;
|
||
|
|
+ }
|
||
|
|
+ this.setAbsorptionHearts(absorptionAmount);
|
||
|
|
+ // Paper end
|
||
|
|
if (nbttagcompound.hasKeyOfType("Attributes", 9) && this.world != null && !this.world.isClientSide) {
|
||
|
|
this.getAttributeMap().a(nbttagcompound.getList("Attributes", 10));
|
||
|
|
}
|
||
|
|
@@ -1151,6 +1157,10 @@ public abstract class EntityLiving extends Entity {
|
||
|
|
}
|
||
|
|
|
||
|
|
public void setHealth(float f) {
|
||
|
|
+ // Paper start
|
||
|
|
+ if (Float.isNaN(f)) { f = getMaxHealth(); if (this.valid) {
|
||
|
|
+ System.err.println("[NAN-HEALTH] " + getName() + " had NaN health set");
|
||
|
|
+ } } // Paper end
|
||
|
|
// CraftBukkit start - Handle scaled health
|
||
|
|
if (this instanceof EntityPlayer) {
|
||
|
|
org.bukkit.craftbukkit.entity.CraftPlayer player = ((EntityPlayer) this).getBukkitEntity();
|
||
|
|
@@ -3045,7 +3055,7 @@ public abstract class EntityLiving extends Entity {
|
||
|
|
}
|
||
|
|
|
||
|
|
public void setAbsorptionHearts(float f) {
|
||
|
|
- if (f < 0.0F) {
|
||
|
|
+ if (f < 0.0F || Float.isNaN(f)) { // Paper
|
||
|
|
f = 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 ed5680e6e0fcfbaf948bdede98d206cff2b26467..ab7e731cb04a75b829f0cd24d7b94f7ddad166e8 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||
|
|
@@ -1680,6 +1680,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||
|
|
}
|
||
|
|
|
||
|
|
public void setRealHealth(double health) {
|
||
|
|
+ if (Double.isNaN(health)) {return;} // Paper
|
||
|
|
this.health = health;
|
||
|
|
}
|
||
|
|
|