Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
CraftBukkit Changes:
dba91d2ab SPIGOT-5972: PlayerPortalEvent.setTo() when returning through an End Portal Crashes Server
2c9b379196