testserver/Spigot-Server-Patches/0047-Be-a-bit-more-informat...

From 6b296e8747151670d7b51810ec33a18b7293cf42 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 6146db1841..966d23add1 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -106,7 +106,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.26.2
Updated Upstream (Bukkit/CraftBukkit) 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: b999860d SPIGOT-2304: Add LootGenerateEvent CraftBukkit Changes: 77fd87e4 SPIGOT-2304: Implement LootGenerateEvent a1a705ee SPIGOT-5566: Doused campfires & fires should call EntityChangeBlockEvent 41712edd SPIGOT-5707: PersistentDataHolder not Persistent on API dropped Item 2020-05-01 22:03:47 +00:00			`From 6b296e8747151670d7b51810ec33a18b7293cf42 Mon Sep 17 00:00:00 2001`
Be a bit more informative in maxHealth exception 2016-02-16 22:37:03 +00:00			`From: kashike <kashike@vq.lc>`
Paper 1.9 2016-02-29 23:09:49 +00:00			`Date: Thu, 3 Mar 2016 02:18:39 -0600`
Be a bit more informative in maxHealth exception 2016-02-16 22:37:03 +00:00			`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`
Updated Upstream (Bukkit/CraftBukkit) 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: b999860d SPIGOT-2304: Add LootGenerateEvent CraftBukkit Changes: 77fd87e4 SPIGOT-2304: Implement LootGenerateEvent a1a705ee SPIGOT-5566: Doused campfires & fires should call EntityChangeBlockEvent 41712edd SPIGOT-5707: PersistentDataHolder not Persistent on API dropped Item 2020-05-01 22:03:47 +00:00			`index 6146db1841..966d23add1 100644`
Be a bit more informative in maxHealth exception 2016-02-16 22:37:03 +00:00			`--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java`
			`+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java`
Updated Upstream (Bukkit/CraftBukkit) 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: fd28180e #479: Add LivingEntity#attack, LivingEntity#swingMainHand, LivingEntity#swingOffHand ae72ba3a SPIGOT-5591: Allow concurrent potion effects CraftBukkit Changes: 3d61a853 Fix formatting in CraftLivingEntity f7ab3055 #633: Add LivingEntity#attack, LivingEntity#swingMainHand, LivingEntity#swingOffHand d5ef2eab SPIGOT-5591: Allow concurrent potion effects 25a9a9ff SPIGOT-5592: Custom ChunkGenerator can cause bugged dirt 3f6d0de9 Make it clear in error messages that api-version above 1.13 is also supported 2020-02-25 18:57:15 +00:00			`@@ -106,7 +106,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {`
Be a bit more informative in maxHealth exception 2016-02-16 22:37:03 +00:00			`public void setHealth(double health) {`
Update upstream CB 2017-01-28 23:36:03 +00:00			`health = (float) health;`
Be a bit more informative in maxHealth exception 2016-02-16 22:37:03 +00:00			`if ((health < 0) \|\| (health > getMaxHealth())) {`
Update upstream CB 2017-01-28 23:36:03 +00:00			`- throw new IllegalArgumentException("Health must be between 0 and " + getMaxHealth() + "(" + health + ")");`
Paper 1.9 2016-02-29 23:09:49 +00:00			`+ // Paper - Be more informative`
Be a bit more informative in maxHealth exception 2016-02-16 22:37:03 +00:00			`+ throw new IllegalArgumentException("Health must be between 0 and " + getMaxHealth() + ", but was " + health`
Update to 1.14.4 (#2333) 2019-07-20 04:01:24 +00:00			`+ + ". (attribute base value: " + this.getHandle().getAttributeInstance(GenericAttributes.MAX_HEALTH).getBaseValue()`
Paper 1.9 2016-02-29 23:09:49 +00:00			`+ + (this instanceof CraftPlayer ? ", player: " + this.getName() + ')' : ')'));`
Be a bit more informative in maxHealth exception 2016-02-16 22:37:03 +00:00			`}`

Update upstream B/CB/S 2017-05-04 23:08:52 +00:00			`getHandle().setHealth((float) health);`
Be a bit more informative in maxHealth exception 2016-02-16 22:37:03 +00:00			`--`
Updated Upstream (Bukkit/CraftBukkit) 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: b999860d SPIGOT-2304: Add LootGenerateEvent CraftBukkit Changes: 77fd87e4 SPIGOT-2304: Implement LootGenerateEvent a1a705ee SPIGOT-5566: Doused campfires & fires should call EntityChangeBlockEvent 41712edd SPIGOT-5707: PersistentDataHolder not Persistent on API dropped Item 2020-05-01 22:03:47 +00:00			`2.26.2`
Be a bit more informative in maxHealth exception 2016-02-16 22:37:03 +00:00