2019-07-20 12:01:24 +08:00
|
|
|
From 79217cb0b53cf7dc77e9e07086ee7a54f7364ef0 Mon Sep 17 00:00:00 2001
|
2016-02-17 06:37:03 +08:00
|
|
|
From: kashike <kashike@vq.lc>
|
2016-03-01 07:09:49 +08:00
|
|
|
Date: Thu, 3 Mar 2016 02:18:39 -0600
|
2016-02-17 06:37:03 +08:00
|
|
|
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
|
2019-07-20 12:01:24 +08:00
|
|
|
index 2e007d4ffc..4948e61da9 100644
|
2016-02-17 06:37:03 +08:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
2019-05-22 12:14:56 +08:00
|
|
|
@@ -104,7 +104,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
|
2016-02-17 06:37:03 +08:00
|
|
|
public void setHealth(double health) {
|
2017-01-29 07:36:03 +08:00
|
|
|
health = (float) health;
|
2016-02-17 06:37:03 +08:00
|
|
|
if ((health < 0) || (health > getMaxHealth())) {
|
2017-01-29 07:36:03 +08:00
|
|
|
- throw new IllegalArgumentException("Health must be between 0 and " + getMaxHealth() + "(" + health + ")");
|
2016-03-01 07:09:49 +08:00
|
|
|
+ // Paper - Be more informative
|
2016-02-17 06:37:03 +08:00
|
|
|
+ throw new IllegalArgumentException("Health must be between 0 and " + getMaxHealth() + ", but was " + health
|
2019-07-20 12:01:24 +08:00
|
|
|
+ + ". (attribute base value: " + this.getHandle().getAttributeInstance(GenericAttributes.MAX_HEALTH).getBaseValue()
|
2016-03-01 07:09:49 +08:00
|
|
|
+ + (this instanceof CraftPlayer ? ", player: " + this.getName() + ')' : ')'));
|
2016-02-17 06:37:03 +08:00
|
|
|
}
|
|
|
|
|
2017-05-05 07:08:52 +08:00
|
|
|
getHandle().setHealth((float) health);
|
2016-02-17 06:37:03 +08:00
|
|
|
--
|
2019-06-26 03:18:50 +08:00
|
|
|
2.22.0
|
2016-02-17 06:37:03 +08:00
|
|
|
|