Update upstream B/CB/S

Spigot-Server-Patches/Be-a-bit-more-informative-in-maxHealth-exception.patch

@@ -19,5 +19,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +                    + (this instanceof CraftPlayer ? ", player: " + this.getName() + ')' : ')'));
          }
  
-         if (entity instanceof EntityPlayer && health == 0) {
+         if (health == 0) {
 --

Spigot-Server-Patches/Set-health-before-death-event.patch

@@ -30,10 +30,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        if (com.destroystokyo.paper.PaperConfig.setHealthBeforeDeathEvent) {
 +            this.getHandle().setHealth((float) health);
 +        }
-+        // Paper end
-+
-         if (entity instanceof EntityPlayer && health == 0) {
-             ((EntityPlayer) entity).die(DamageSource.GENERIC);
++        
+         if (health == 0) {
+             getHandle().die(DamageSource.GENERIC);
          }
  
 -        getHandle().setHealth((float) health);