Upstream has released updates that appears to apply and compile correctly
Paper Changes:
dccaf59a MC-197883: Bandaid decode issue
99a1e58f Merge branch 'master' into progress/1.16.2
7470c3ef Do not let the server load chunks from newer versions (1.16.2+)
ecbc5ca0 Updated Upstream (CraftBukkit)
Upstream has released updates that appears to apply and compile correctly
Paper Changes:
1daafe455 Updated Upstream (Bukkit/CraftBukkit)
98828b006 Merge pull request #4132 from Proximyst/progress/1.16.2
b23f27f8d Fix incorrect return for WorldServer#addAllEntitiesSafely (#3)
5085fa30c Fix MC-187716 Use configured height
c44add5a0 Initialise a new chunk section if none was found yet updated
74a4d5f8b Remove armour stand double add to world
6d25cc4ec Don't mark null chunk sections for block updates