From 0045a21519ff63550cc7dad9107114e988d13b27 Mon Sep 17 00:00:00 2001
From: oxygencraft <21054297+oxygencraft@users.noreply.github.com>
Date: Mon, 8 Jun 2020 04:36:13 +1000
Subject: [PATCH] Change name and id to get from profile in
 AsyncPlayerPreLoginEvent (#3511)

Co-authored-by: Daniel Ennis <aikar@aikar.co>
---
 ...e-PlayerProfile-in-AsyncPreLoginEven.patch | 39 ++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/Spigot-API-Patches/Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/Spigot-API-Patches/Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
index 94ab8b763..b8151a2ec 100644
--- a/Spigot-API-Patches/Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
+++ b/Spigot-API-Patches/Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
@@ -19,6 +19,18 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  import org.bukkit.event.Event;
  import org.bukkit.event.HandlerList;
  import org.jetbrains.annotations.NotNull;
+@@ -0,0 +0,0 @@ public class AsyncPlayerPreLoginEvent extends Event {
+     private static final HandlerList handlers = new HandlerList();
+     private Result result;
+     private String message;
+-    private final String name;
++    //private String name; // Paper - Not used anymore
+     private final InetAddress ipAddress;
+-    private final UUID uniqueId;
++    //private UUID uniqueId; // Paper - Not used anymore
+ 
+     @Deprecated
+     public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress) {
 @@ -0,0 +0,0 @@ public class AsyncPlayerPreLoginEvent extends Event {
      }
  
@@ -51,4 +63,29 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        // Paper end
          this.result = Result.ALLOWED;
          this.message = "";
-         this.name = name;
+-        this.name = name;
++        //this.name = name; // Paper - Not used anymore
+         this.ipAddress = ipAddress;
+-        this.uniqueId = uniqueId;
++        //this.uniqueId = uniqueId; // Paper - Not used anymore
+     }
+ 
+     /**
+@@ -0,0 +0,0 @@ public class AsyncPlayerPreLoginEvent extends Event {
+      */
+     @NotNull
+     public String getName() {
+-        return name;
++        return profile.getName(); // Paper
+     }
+ 
+     /**
+@@ -0,0 +0,0 @@ public class AsyncPlayerPreLoginEvent extends Event {
+      */
+     @NotNull
+     public UUID getUniqueId() {
+-        return uniqueId;
++        return profile.getId(); // Paper
+     }
+ 
+     @NotNull