Paper/Spigot-Server-Patches/0049-Be-a-bit-more-informative-in-maxHealth-exception.patch

26 lines
1.3 KiB
Diff
Raw Normal View History

From 62e5eaac06b42adfec37d77a1e29dabfc855d7f3 Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc>
2016-03-01 00:09:49 +01:00
Date: Thu, 3 Mar 2016 02:18:39 -0600
Subject: [PATCH] Be a bit more informative in maxHealth exception
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index cc9e48d585..dff0dd2e9a 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
2018-07-28 04:38:13 +02:00
@@ -98,7 +98,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
public void setHealth(double health) {
2017-01-29 00:36:03 +01:00
health = (float) health;
if ((health < 0) || (health > getMaxHealth())) {
2017-01-29 00:36:03 +01:00
- throw new IllegalArgumentException("Health must be between 0 and " + getMaxHealth() + "(" + health + ")");
2016-03-01 00:09:49 +01:00
+ // Paper - Be more informative
+ throw new IllegalArgumentException("Health must be between 0 and " + getMaxHealth() + ", but was " + health
2016-03-01 00:09:49 +01:00
+ + ". (attribute base value: " + this.getHandle().getAttributeInstance(GenericAttributes.maxHealth).b()
+ + (this instanceof CraftPlayer ? ", player: " + this.getName() + ')' : ')'));
}
2017-05-05 01:08:52 +02:00
getHandle().setHealth((float) health);
--
2.19.0