From 6b6373a077f6b66ab06f61e1d46dfe1d61447507 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 21 Mar 2018 19:12:02 -0400
Subject: [PATCH] Only complete incomplete profiles - Resolves #1053

---
 Spigot-Server-Patches/Basic-PlayerProfile-API.patch         | 6 ++++--
 .../Call-PortalCreateEvent-for-exit-portals.patch           | 2 +-
 Spigot-Server-Patches/Player.setPlayerProfile-API.patch     | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Spigot-Server-Patches/Basic-PlayerProfile-API.patch b/Spigot-Server-Patches/Basic-PlayerProfile-API.patch
index b4f6ebe42f..a9a6f7a5e2 100644
--- a/Spigot-Server-Patches/Basic-PlayerProfile-API.patch
+++ b/Spigot-Server-Patches/Basic-PlayerProfile-API.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Basic PlayerProfile API
 
 diff --git a/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java
 new file mode 100644
-index 000000000..2cfd65bc1
+index 000000000..1d669e3e2
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java
 @@ -0,0 +0,0 @@
@@ -121,7 +121,9 @@ index 000000000..2cfd65bc1
 +    }
 +
 +    public boolean complete() {
-+        profile = MinecraftServer.getServer().getSessionService().fillProfileProperties(profile, true);
++        if (!profile.isComplete()) {
++            profile = MinecraftServer.getServer().getSessionService().fillProfileProperties(profile, true);
++        }
 +        return profile.isComplete();
 +    }
 +
diff --git a/Spigot-Server-Patches/Call-PortalCreateEvent-for-exit-portals.patch b/Spigot-Server-Patches/Call-PortalCreateEvent-for-exit-portals.patch
index 32b5f8db70..b7f7c8b782 100644
--- a/Spigot-Server-Patches/Call-PortalCreateEvent-for-exit-portals.patch
+++ b/Spigot-Server-Patches/Call-PortalCreateEvent-for-exit-portals.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Call PortalCreateEvent for exit portals
 
 
 diff --git a/src/main/java/net/minecraft/server/PortalTravelAgent.java b/src/main/java/net/minecraft/server/PortalTravelAgent.java
-index f4972979..42e4b2d0 100644
+index f49729796..42e4b2d01 100644
 --- a/src/main/java/net/minecraft/server/PortalTravelAgent.java
 +++ b/src/main/java/net/minecraft/server/PortalTravelAgent.java
 @@ -0,0 +0,0 @@ package net.minecraft.server;
diff --git a/Spigot-Server-Patches/Player.setPlayerProfile-API.patch b/Spigot-Server-Patches/Player.setPlayerProfile-API.patch
index 6bd4f1c53d..9399d4ccf4 100644
--- a/Spigot-Server-Patches/Player.setPlayerProfile-API.patch
+++ b/Spigot-Server-Patches/Player.setPlayerProfile-API.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Player.setPlayerProfile API
 This can be useful for changing name or skins after a player has logged in.
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 4b82e43a..35fde8b2 100644
+index 4b82e43a8..35fde8b23 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -0,0 +0,0 @@ public abstract class EntityHuman extends EntityLiving {
@@ -19,7 +19,7 @@ index 4b82e43a..35fde8b2 100644
      private final ItemCooldown bW;
      @Nullable
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 21631c58..87e31cf0 100644
+index 21631c588..87e31cf0d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -0,0 +0,0 @@