From 51f9edf22dfe2e64d0199db849784088f96f63f1 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 | 43 +++++++++++++++++--
 1 file changed, 40 insertions(+), 3 deletions(-)

diff --git a/Spigot-API-Patches/0085-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/Spigot-API-Patches/0085-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
index 8d1bb19eb..4db167a05 100644
--- a/Spigot-API-Patches/0085-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
+++ b/Spigot-API-Patches/0085-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent
 This will allow you to change the players name or skin on login.
 
 diff --git a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
-index c8384da69af61e1970f254a3a9c206ee81d7a989..6c09ea6c61bdeb6149c8f2f23f15b2abb543e66e 100644
+index c8384da69af61e1970f254a3a9c206ee81d7a989..10292e59257d1c33cf4800d38bc24f6b35f75de1 100644
 --- a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
 +++ b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
 @@ -2,6 +2,9 @@ package org.bukkit.event.player;
@@ -19,7 +19,19 @@ index c8384da69af61e1970f254a3a9c206ee81d7a989..6c09ea6c61bdeb6149c8f2f23f15b2ab
  import org.bukkit.event.Event;
  import org.bukkit.event.HandlerList;
  import org.jetbrains.annotations.NotNull;
-@@ -25,7 +28,32 @@ public class AsyncPlayerPreLoginEvent extends Event {
+@@ -15,9 +18,9 @@ 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) {
+@@ -25,12 +28,37 @@ public class AsyncPlayerPreLoginEvent extends Event {
      }
  
      public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final UUID uniqueId) {
@@ -51,4 +63,29 @@ index c8384da69af61e1970f254a3a9c206ee81d7a989..6c09ea6c61bdeb6149c8f2f23f15b2ab
 +        // 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
+     }
+ 
+     /**
+@@ -140,7 +168,7 @@ public class AsyncPlayerPreLoginEvent extends Event {
+      */
+     @NotNull
+     public String getName() {
+-        return name;
++        return profile.getName(); // Paper
+     }
+ 
+     /**
+@@ -160,7 +188,7 @@ public class AsyncPlayerPreLoginEvent extends Event {
+      */
+     @NotNull
+     public UUID getUniqueId() {
+-        return uniqueId;
++        return profile.getId(); // Paper
+     }
+ 
+     @NotNull