aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorkashike <[email protected]>2016-02-16 14:37:03 -0800
committerkashike <[email protected]>2016-02-16 14:37:28 -0800
commite8118c4a3192369725ea80a774d0cb1593079fc0 (patch)
tree98bac2d7eb0e4aa05e00571d58b8a0ae7340c4d4
parent3ebeccc10904b129739363daa56754008d95f6b8 (diff)
downloadPaper-e8118c4a3192369725ea80a774d0cb1593079fc0.tar.gz
Paper-e8118c4a3192369725ea80a774d0cb1593079fc0.zip
Be a bit more informative in maxHealth exception
-rw-r--r--Spigot-Server-Patches/0092-Be-a-bit-more-informative-in-maxHealth-exception.patch24
1 files changed, 24 insertions, 0 deletions
diff --git a/Spigot-Server-Patches/0092-Be-a-bit-more-informative-in-maxHealth-exception.patch b/Spigot-Server-Patches/0092-Be-a-bit-more-informative-in-maxHealth-exception.patch
new file mode 100644
index 0000000000..0b5b3efcd0
--- /dev/null
+++ b/Spigot-Server-Patches/0092-Be-a-bit-more-informative-in-maxHealth-exception.patch
@@ -0,0 +1,24 @@
+From b2ef1030ddd6d746537b351980967f188a8dd582 Mon Sep 17 00:00:00 2001
+From: kashike <[email protected]>
+Date: Tue, 16 Feb 2016 13:36:04 -0800
+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 5317cff..3e3a048 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+@@ -80,7 +80,9 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+
+ public void setHealth(double health) {
+ if ((health < 0) || (health > getMaxHealth())) {
+- throw new IllegalArgumentException("Health must be between 0 and " + getMaxHealth());
++ throw new IllegalArgumentException("Health must be between 0 and " + getMaxHealth() + ", but was " + health
++ + ". (attribute base value: " + this.getHandle().getAttributeInstance(GenericAttributes.maxHealth).b()
++ + (this instanceof CraftPlayer ? ", player: " + this.getName() + ')' : ')'));
+ }
+
+ if (entity instanceof EntityPlayer && health == 0) {
+--
+2.7.0.rc0.20.g4b9ab0e
+