From e44b71a6b4957a3b77ef4edd61b87352fdd36713 Mon Sep 17 00:00:00 2001 From: kashike Date: Thu, 1 Sep 2016 09:54:06 +0000 Subject: [PATCH] Convert new health to a float during set Convert the new health value to a float before doing any validation logic --- ...ert-new-health-to-a-float-during-set.patch | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 Spigot-Server-Patches/0169-Convert-new-health-to-a-float-during-set.patch diff --git a/Spigot-Server-Patches/0169-Convert-new-health-to-a-float-during-set.patch b/Spigot-Server-Patches/0169-Convert-new-health-to-a-float-during-set.patch new file mode 100644 index 0000000000..e76a0c40f0 --- /dev/null +++ b/Spigot-Server-Patches/0169-Convert-new-health-to-a-float-during-set.patch @@ -0,0 +1,22 @@ +From 04533a98c1be92ba73a9ce4cde2ee8759500cbde Mon Sep 17 00:00:00 2001 +From: kashike +Date: Thu, 1 Sep 2016 09:51:31 +0000 +Subject: [PATCH] Convert new health to a float during set Convert the new + health value to a float before doing any validation logic + + +diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +index b807a3f..9e19e7c 100644 +--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java ++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +@@ -91,6 +91,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { + } + + public void setHealth(double health) { ++ health = (float) health; // Paper - convert health to a float during set to avoid the below error + if ((health < 0) || (health > getMaxHealth())) { + // Paper - Be more informative + throw new IllegalArgumentException("Health must be between 0 and " + getMaxHealth() + ", but was " + health +-- +2.5.0 +