Upstream has released updates that appears to apply and compile correctly
Paper Changes:
1dc7c308a Optimize Collision Chunk lookup and avoid loading far chunks
d5c6dbee5 Prevent Double PlayerChunkMap adds crashing server
a2a9ffe3b Fix issues with Activation Range causing large chunk lookups.
017297cdb Improve entity.getCurrentChunk() and use it for entity.isChunkLoaded()
52cf89060 Remove some old removed 1.14 patches that are never going to be needed (fixed/already applied)
