CatMC-Network/PaperSpigot-Parent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #31 from kashike/feature/better-exceptions

Browse Source 
Be a bit more informative in maxHealth exception
This commit is contained in:
Zach 2016-02-16 18:48:14 -06:00
commit 752ba5c528
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Spigot-Server-Patches/0092-Be-a-bit-more-informative-in-maxHealth-exception.patch Normal file
View File

@ -0,0 +1,24 @@
From b2ef1030ddd6d746537b351980967f188a8dd582 Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc>
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