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

From 0584b5fc1984c1b5d3bde9f0de6ce437514138d3 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 2e007d4ffc..82b3c0a7de 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -104,7 +104,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).b()
+                    + (this instanceof CraftPlayer ? ", player: " + this.getName() + ')' : ')'));
         }
 
         getHandle().setHealth((float) health);
-- 
2.21.0
Update upstream & fix some chunk related issues (#2177) * 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: 45690fe9 SPIGOT-5047: Correct slot types for 1.14 inventories CraftBukkit Changes: 4090d01f SPIGOT-5047: Correct slot types for 1.14 inventories e8c08362 SPIGOT-5046: World#getLoadedChunks returning inaccessible cached chunks. d445af3b SPIGOT-5067: Add item meta for 1.14 spawn eggs * Bring Chunk load checks in-line with spigot As of the last upstream merge spigot now checks ticket level status when returning loaded chunks for a world from api. Now our checks will respect that decision. * Fix spawn ticket levels Vanilla would keep the inner chunks of spawn available for ticking, however my changes made all chunks non-ticking. Resolve by changing ticket levels for spawn chunks inside the border to respect this behavior. * Make World#getChunkIfLoadedImmediately return only entity ticking chunks Mojang appears to be using chunks with level > 33 (non-ticking chunks) as cached chunks and not actually loaded chunks. * Bring all loaded checks in line with spigot Loaded chunks must be at least border chunks, or level <= 33 2019-06-14 02:27:40 +00:00			`From 0584b5fc1984c1b5d3bde9f0de6ce437514138d3 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 (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 CraftBukkit Changes: 17543ecf SPIGOT-5035: Error Using Virtual Merchant GUI 0fc6922b SPIGOT-5028: Villager#setVillagerExperience() doesn't work bdbdbe44 SPIGOT-5024: Fox error - Unknown target reason 2019-06-06 15:36:57 +00:00			`index 2e007d4ffc..82b3c0a7de 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`
Fix compilation 2019-05-22 04:14:56 +00:00			`@@ -104,7 +104,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`
More compile error fixes 2019-05-06 00:57:14 +00:00			`+ + ". (attribute base value: " + this.getHandle().getAttributeInstance(GenericAttributes.MAX_HEALTH).b()`
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			`--`
Initial work on 1.14 pre-5 2019-04-23 04:47:07 +00:00			`2.21.0`
Be a bit more informative in maxHealth exception 2016-02-16 22:37:03 +00:00