Update upstream B/CB

--- work/Bukkit
Submodule work/Bukkit 96e09e50..0b95b68f:
  > SPIGOT-4650: Charging API for Vex

--- work/CraftBukkit
Submodule work/CraftBukkit f102d882..77ca7ca0:
  > Rebuild patches
  > Improve damage handling of dead entities
  > SPIGOT-4646: Test + fix InventoryWrapper.getContents
  > SPIGOT-4650: Charging API for Vex

Spigot-API-Patches/0120-Vex-getSummoner-API.patch

@@ -1,4 +1,4 @@
-From 31def18565e09b797cffabedeff88881b21ba67e Mon Sep 17 00:00:00 2001
+From ed4de91ce14776b268c13b40d31e75e477fb96c5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 Jul 2018 15:29:21 -0400
 Subject: [PATCH] Vex#getSummoner API
@@ -6,21 +6,19 @@ Subject: [PATCH] Vex#getSummoner API
 Get's the Mob that summoned this Vex
 
 diff --git a/src/main/java/org/bukkit/entity/Vex.java b/src/main/java/org/bukkit/entity/Vex.java
-index a2f2fcae..d395e405 100644
+index 6b61c4ab..7b9b21e5 100644
 --- a/src/main/java/org/bukkit/entity/Vex.java
 +++ b/src/main/java/org/bukkit/entity/Vex.java
-@@ -3,4 +3,10 @@ package org.bukkit.entity;
- /**
-  * Represents a Vex.
-  */
--public interface Vex extends Monster { }
-+public interface Vex extends Monster {
+@@ -22,4 +22,9 @@ public interface Vex extends Monster {
+      * @param charging new state
+      */
+     void setCharging(boolean charging);
++
 +    /**
 +     * @return What Entity (most likely an Evoker, but not guaranteed) summoned this Vex
 +     */
 +    Mob getSummoner(); // Paper
-+
-+}
+ }
 -- 
-2.20.1
+2.21.0
 

Spigot-API-Patches/0158-Allow-setting-the-vex-s-summoner.patch

@@ -1,34 +1,35 @@
-From 0386e908841eba3bb839cf0369d23eabebb8b440 Mon Sep 17 00:00:00 2001
+From 6772c9bcb0f4cad1a8f63120a2b266bd1b129a46 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 6 Oct 2018 21:47:09 -0500
 Subject: [PATCH] Allow setting the vex's summoner
 
 
 diff --git a/src/main/java/org/bukkit/entity/Vex.java b/src/main/java/org/bukkit/entity/Vex.java
-index d395e405..78f0082e 100644
+index 7b9b21e5..23a15f8f 100644
 --- a/src/main/java/org/bukkit/entity/Vex.java
 +++ b/src/main/java/org/bukkit/entity/Vex.java
-@@ -7,6 +7,19 @@ public interface Vex extends Monster {
-     /**
-      * @return What Entity (most likely an Evoker, but not guaranteed) summoned this Vex
+@@ -23,8 +23,19 @@ public interface Vex extends Monster {
       */
--    Mob getSummoner(); // Paper
+     void setCharging(boolean charging);
+ 
 +    // Paper start
-+    /**
+     /**
+-     * @return What Entity (most likely an Evoker, but not guaranteed) summoned this Vex
 +     * Get the Mob that summoned this vex
 +     *
 +     * @return Mob that summoned this vex
 +     */
 +    Mob getSummoner();
- 
++
 +    /**
 +     * Set the summoner of this vex
 +     *
 +     * @param summoner New summoner
-+     */
+      */
+-    Mob getSummoner(); // Paper
 +    void setSummoner(Mob summoner);
 +    // Paper end
  }
 -- 
-2.20.1
+2.21.0
 

Spigot-Server-Patches/0425-Improve-damage-handling-of-dead-entities.patch

@@ -1,24 +0,0 @@
-From 09f9a46e3529faa5dbb60fe39812ed30f2759f71 Mon Sep 17 00:00:00 2001
-From: Phoenix616 <mail@moep.tv>
-Date: Tue, 5 Mar 2019 23:57:38 -0500
-Subject: [PATCH] Improve damage handling of dead entities
-
-Manual application of 73597ed865e92dbfad404b69eb6468fb7e129ad2 until the
-upstream patch file is sorted out.
-
-diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index b4f21171..77ea0ec4 100644
---- a/src/main/java/net/minecraft/server/EntityLiving.java
-+++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -939,7 +939,7 @@ public abstract class EntityLiving extends Entity {
-             return false;
-         } else if (this.world.isClientSide) {
-             return false;
--        } else if (this.getHealth() <= 0.0F) {
-+        } else if (this.dead || this.killed || this.getHealth() <= 0.0F) { // Paper // CraftBukkit - Don't allow entities that got set to dead/killed elsewhere to get damaged and die
-             return false;
-         } else if (damagesource.p() && this.hasEffect(MobEffects.FIRE_RESISTANCE)) {
-             return false;
--- 
-2.21.0
-

work/Bukkit

@@ -1 +1 @@
-Subproject commit 96e09e50c121f5a9066fe490b8f3a7a68b7ab54c
+Subproject commit 0b95b68f96f3f5bf72b6857967d02d187d0f37e1

work/CraftBukkit

@@ -1 +1 @@
-Subproject commit f102d882996f7409efc2a0cc5e70a583d901097d
+Subproject commit 77ca7ca07bbc0d73699addd51eba032916b57f6b