Upstream has released updates that appears to apply and compile correctly
Paper Changes:
8522e7b2 Fix shutdown on eula not being agreed (Fixes#4647)
c43dcbfc Improve old UUID support, clean up old legacy keys.
f63e3dd1 Allow teleporting through end gateways as a passenger/vehicle
b7d9e3d5 Convert legacy attributes in Item Meta
4fd0d54e Fix server not stopping when eula not agreed yet
6f30ecde Clean up duplicated GameProfile Properties
d3047226 Fix supporting more places of the old UUID format
f5265d66 Updated Upstream (Bukkit/CraftBukkit/Spigot)
