[ci skip] Cleanup events (#10202)

patches/api/Add-more-fields-to-AsyncPreLoginEvent.patch

@@ -14,7 +14,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  
  import java.net.InetAddress;
  import java.util.UUID;
-+
 +import com.destroystokyo.paper.profile.PlayerProfile;
 +import org.bukkit.Bukkit;
  import org.bukkit.event.Event;
@@ -80,8 +79,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      public UUID getUniqueId() {
 -        return uniqueId;
 +        return profile.getId(); // Paper
-     }
- 
++    }
++
 +    // Paper start
 +    /**
 +     * Gets the PlayerProfile of the player logging in
@@ -107,8 +106,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    @NotNull
 +    public InetAddress getRawAddress() {
 +        return rawAddress;
-+    }
-+
+     }
+ 
 +    /**
 +     * Gets the hostname that the player used to connect to the server, or
 +     * blank if unknown