2017-04-29 10:27:31 +00:00
|
|
|
From a95f24eee446165a8c8006583b0de0f793c168da Mon Sep 17 00:00:00 2001
|
2016-02-16 22:37:03 +00:00
|
|
|
From: kashike <kashike@vq.lc>
|
2016-02-29 23:09:49 +00:00
|
|
|
Date: Thu, 3 Mar 2016 02:18:39 -0600
|
2016-02-16 22:37:03 +00: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
|
2017-03-25 05:22:02 +00:00
|
|
|
index 27cd0d43d..61032eb2f 100644
|
2016-02-16 22:37:03 +00:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
2017-02-02 04:48:16 +00:00
|
|
|
@@ -96,7 +96,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
|
2016-02-16 22:37:03 +00:00
|
|
|
public void setHealth(double health) {
|
2017-01-28 23:36:03 +00:00
|
|
|
health = (float) health;
|
2016-02-16 22:37:03 +00:00
|
|
|
if ((health < 0) || (health > getMaxHealth())) {
|
2017-01-28 23:36:03 +00:00
|
|
|
- throw new IllegalArgumentException("Health must be between 0 and " + getMaxHealth() + "(" + health + ")");
|
2016-02-29 23:09:49 +00:00
|
|
|
+ // Paper - Be more informative
|
2016-02-16 22:37:03 +00:00
|
|
|
+ throw new IllegalArgumentException("Health must be between 0 and " + getMaxHealth() + ", but was " + health
|
2016-02-29 23:09:49 +00:00
|
|
|
+ + ". (attribute base value: " + this.getHandle().getAttributeInstance(GenericAttributes.maxHealth).b()
|
|
|
|
+ + (this instanceof CraftPlayer ? ", player: " + this.getName() + ')' : ')'));
|
2016-02-16 22:37:03 +00:00
|
|
|
}
|
|
|
|
|
2016-07-30 23:02:34 +00:00
|
|
|
if (health == 0) {
|
2016-02-16 22:37:03 +00:00
|
|
|
--
|
2017-04-29 10:27:31 +00:00
|
|
|
2.12.2.windows.2
|
2016-02-16 22:37:03 +00:00
|
|
|
|