mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-28 19:22:50 +01:00
c68dbb864c
* Updated Upstream (Bukkit/CraftBukkit/Spigot) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 6527cb58 SPIGOT-5329: Clarify isGlowing documentation 5ddb414f Make Lantern extend BlockData cb888903 Fix typos in previous commits 2a5e0ca2 Bring EnchantItemEvent documentation in line with EnchantmentOffer 3c5fcea2 SPIGOT-5317: Create accessors for player absorption hearts c6e0d625 SPIGOT-5320: Clarify scope of ExactChoice CraftBukkit Changes:a3fdef8cSPIGOT-5331: Add support for Java 136ddeb980SPIGOT-5317: Create accessors for player absorption hearts5d335e96SPIGOT-5315: Cannot serialize armor stand ItemMeta Spigot Changes: 94af569b SPIGOT-5319: Async catcher for getNearbyEntities
25 lines
1.3 KiB
Diff
25 lines
1.3 KiB
Diff
From 050e035a301c95145bb4c1c8f0c4a74a67d15f6d 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 9c1d4e758..029c2d475 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
|
@@ -105,7 +105,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
|
|
public void setHealth(double health) {
|
|
health = (float) health;
|
|
if ((health < 0) || (health > getMaxHealth())) {
|
|
- throw new IllegalArgumentException("Health must be between 0 and " + getMaxHealth() + "(" + health + ")");
|
|
+ // Paper - Be more informative
|
|
+ throw new IllegalArgumentException("Health must be between 0 and " + getMaxHealth() + ", but was " + health
|
|
+ + ". (attribute base value: " + this.getHandle().getAttributeInstance(GenericAttributes.MAX_HEALTH).getBaseValue()
|
|
+ + (this instanceof CraftPlayer ? ", player: " + this.getName() + ')' : ')'));
|
|
}
|
|
|
|
getHandle().setHealth((float) health);
|
|
--
|
|
2.22.1
|
|
|