Updated Upstream (Bukkit/CraftBukkit)

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:
ebb0e28d #631: Add Villager#shakeHead
751469c6 #629: Add LivingEntity#isClimbing

CraftBukkit Changes:
622cf611 SPIGOT-6555: Cannot access shield BlockStateMeta
8b2e78ec SPIGOT-6542: Fix counting players with fauxSleeping = true
f66c437a SPIGOT-6561: Add events for dripleaf tilting
6ed40004 SPIGOT-6560: Crash when falling stalactite hits player
72a2901b SPIGOT-6557: PlayerEditBookEvent#setNewBookMeta does not update meta
a07e783a #865: Implement Villager#shakeHead
3252ff18 #863: Add LivingEntity#isClimbing
77058c79 SPIGOT-6554: Worlds created with the bukkit ChunkGenerator cannot save

patches/server/Call-player-spectator-target-events-and-improve-impl.patch

@@ -93,8 +93,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          }
      }
  
--    private void a(List<TextFilter.FilteredText> list, UnaryOperator<String> unaryoperator, ItemStack itemstack, int slot, ItemStack old) { // CraftBukkit
-+    public void a(List<TextFilter.FilteredText> list, UnaryOperator<String> unaryoperator, ItemStack itemstack, int slot, ItemStack old) { // CraftBukkit // Paper - make public
+-    private void a(List<TextFilter.FilteredText> list, UnaryOperator<String> unaryoperator, ItemStack itemstack, int slot, ItemStack handItem) { // CraftBukkit
++    public void a(List<TextFilter.FilteredText> list, UnaryOperator<String> unaryoperator, ItemStack itemstack, int slot, ItemStack handItem) { // CraftBukkit // Paper - make public
          ListTag nbttaglist = new ListTag();
  
          if (this.player.isTextFilteringEnabled()) {

patches/server/Don-t-ignore-result-of-PlayerEditBookEvent.patch

@@ -12,8 +12,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          }
  
          itemstack.addTagElement("pages", (Tag) nbttaglist);
--        CraftEventFactory.handleEditBookEvent(player, slot, old, itemstack); // CraftBukkit
-+        this.player.containerMenu.setItem(slot, CraftEventFactory.handleEditBookEvent(player, slot, old, itemstack)); // CraftBukkit // Paper - Don't ignore result (see other callsite for handleEditBookEvent)
+-        CraftEventFactory.handleEditBookEvent(player, slot, handItem, itemstack); // CraftBukkit
++        this.player.containerMenu.setItem(slot, CraftEventFactory.handleEditBookEvent(player, slot, handItem, itemstack)); // CraftBukkit // Paper - Don't ignore result (see other callsite for handleEditBookEvent)
      }
  
      @Override

work/Bukkit

@@ -1 +1 @@
-Subproject commit a791f93de242bf89d116fed843b889e38433e094
+Subproject commit ebb0e28d11747aa0bb4bb39fad8979ccfaa925b6

work/CraftBukkit

@@ -1 +1 @@
-Subproject commit 85b8c1fda69f6f80e45ddd19590846c249e5b6bc
+Subproject commit 622cf6111905e787add191b9a88d62656439ef31