2016-03-05 03:14:27 +01:00
|
|
|
From 919e7babbeed909d2b51a4e1764f673cd1132070 Mon Sep 17 00:00:00 2001
|
2016-02-16 23:37:03 +01:00
|
|
|
From: kashike <kashike@vq.lc>
|
2016-03-01 00:09:49 +01:00
|
|
|
Date: Thu, 3 Mar 2016 02:18:39 -0600
|
2016-02-16 23:37:03 +01: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
|
2016-03-04 06:50:05 +01:00
|
|
|
index e8aff90..ebf378b 100644
|
2016-02-16 23:37:03 +01:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
2016-03-04 06:50:05 +01:00
|
|
|
@@ -85,7 +85,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
|
2016-02-16 23:37:03 +01:00
|
|
|
|
|
|
|
public void setHealth(double health) {
|
|
|
|
if ((health < 0) || (health > getMaxHealth())) {
|
|
|
|
- throw new IllegalArgumentException("Health must be between 0 and " + getMaxHealth());
|
2016-03-01 00:09:49 +01:00
|
|
|
+ // Paper - Be more informative
|
2016-02-16 23:37:03 +01:00
|
|
|
+ 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() + ')' : ')'));
|
2016-02-16 23:37:03 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
if (entity instanceof EntityPlayer && health == 0) {
|
|
|
|
--
|
2016-03-01 00:09:49 +01:00
|
|
|
2.7.2
|
2016-02-16 23:37:03 +01:00
|
|
|
|