Updated Upstream (Bukkit/CraftBukkit) (#7045)

Upstream has released updates that appear 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:
ffd8b289 PR-687: Fix NPE from previous commits

CraftBukkit Changes:
3c2af1b7 SPIGOT-6831: Fix llama strength crash
This commit is contained in:
Noah van der Aa
2021-12-06 13:43:46 +01:00
parent 4519c88cb7
commit 6de2d9794c
4 changed files with 3 additions and 53 deletions