Add EntityPortalExitEvent back and use a teleport.. not great but it might help