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