Upstream has released updates that appears to apply and compile correctly
Paper Changes:
932e97f3 Rename to AsyncPlayerSendSuggestionsEvent to be consistent in naming
0dd19075 AsyncSendPlayerSuggestionsEvent Brigadier Event
a9e20e5f Fix being kicked in survival for block picking - Fixes#3277
4d20537e Expose game version (#3274)
85fb0015 Validate PickItem Packet and kick for invalid - Fixes#3256
5729bc71 Special case Keep Alive packets from Anti Xray
a76b7740 Improved oversized chunk data packet handling
a6f78170 Use Vanilla Bed Search for non players (Villagers)
68fb98b5 Fix 2 plugin specific issues with loot drop and pathfinders
6e41f7b7 Update Activation Range 2.0 with more villager controls
57dd3971 Updated Upstream (Bukkit/CraftBukkit)
