mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-21 00:17:56 +01:00
26 lines
1.3 KiB
Diff
26 lines
1.3 KiB
Diff
From 26480c5baebe4a6567d60581907652d49bf199aa Mon Sep 17 00:00:00 2001
|
|
From: kashike <kashike@vq.lc>
|
|
Date: Thu, 3 Mar 2016 02:18:39 -0600
|
|
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 ad3917d..6f25d18 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
|
@@ -92,7 +92,10 @@ 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());
|
|
+ // Paper - Be more informative
|
|
+ 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.2
|
|
|