mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-29 11:42:55 +01:00
10469dfd46
Ultimately they should be unnecessary now that upstream's fix has been in place for a while. Removing this reduces our own footprint, and gets rid of any possible unintended behavior.
22 lines
1.1 KiB
Diff
22 lines
1.1 KiB
Diff
From 87609705a4c0c86119a8deeb7f4b31325cca030a Mon Sep 17 00:00:00 2001
|
|
From: kashike <kashike@vq.lc>
|
|
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.10.0
|
|
|