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
This commit is contained in:
Zach Brown
2019-03-06 00:46:21 -05:00
parent bf3ce069c8
commit a663d0d550
5 changed files with 17 additions and 40 deletions