mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-02 13:07:06 +01:00
243d2313b9
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: 323d6ca3 #535: Add EntityCategory API to LivingEntity 7d3323d8 #526: Add Block#applyBoneMeal() CraftBukkit Changes:bf451617SPIGOT-6109: Improve loot handlingbfea4559SPIGOT-6111: NPE in CraftHumanEntity#openWorkbench & CraftHumanEntity#openEnchantingee7116b4Add note to CONTRIBUTING.md to suggest keeping commit messages / titles the sameeae15943#721: Add EntityCategory API to LivingEntity8c611560#702: Add Block#applyBoneMeal()8408de02#716: Fix barrel open API playing sound twice74b6982b#711: Add Full RGB support to the console
22 lines
1.4 KiB
Diff
22 lines
1.4 KiB
Diff
From 0000000000000000000000000000000000000000 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 83ea999ed51161356e075c8ba93375a5cafc2be9..c608732fb2b7c3d80a1fe12c007e0237caadcbfc 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
|
@@ -111,7 +111,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);
|