From 723109fa8443f3043f4f0419c0a3e2ffd73dab69 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 21 Mar 2018 19:12:02 -0400 Subject: [PATCH] Only complete incomplete profiles - Resolves #1053 --- .../0214-Basic-PlayerProfile-API.patch | 10 ++++++---- ...0277-Call-PortalCreateEvent-for-exit-portals.patch} | 4 ++-- ...PI.patch => 0278-Player.setPlayerProfile-API.patch} | 8 ++++---- 3 files changed, 12 insertions(+), 10 deletions(-) rename Spigot-Server-Patches/{0276-Call-PortalCreateEvent-for-exit-portals.patch => 0277-Call-PortalCreateEvent-for-exit-portals.patch} (98%) rename Spigot-Server-Patches/{0277-Player.setPlayerProfile-API.patch => 0278-Player.setPlayerProfile-API.patch} (96%) diff --git a/Spigot-Server-Patches/0214-Basic-PlayerProfile-API.patch b/Spigot-Server-Patches/0214-Basic-PlayerProfile-API.patch index 7554745f0c..d6d675bee3 100644 --- a/Spigot-Server-Patches/0214-Basic-PlayerProfile-API.patch +++ b/Spigot-Server-Patches/0214-Basic-PlayerProfile-API.patch @@ -1,4 +1,4 @@ -From d59f6eb0f4ce7dbd4e2ad3c366c5950e1bb6d9ca Mon Sep 17 00:00:00 2001 +From c27298c0ed821b2e7556e75100ed55c5830bcead Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 15 Jan 2018 22:11:48 -0500 Subject: [PATCH] Basic PlayerProfile API @@ -6,10 +6,10 @@ 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 +1,197 @@ +@@ -0,0 +1,199 @@ +package com.destroystokyo.paper.profile; + +import com.mojang.authlib.GameProfile; @@ -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/0276-Call-PortalCreateEvent-for-exit-portals.patch b/Spigot-Server-Patches/0277-Call-PortalCreateEvent-for-exit-portals.patch similarity index 98% rename from Spigot-Server-Patches/0276-Call-PortalCreateEvent-for-exit-portals.patch rename to Spigot-Server-Patches/0277-Call-PortalCreateEvent-for-exit-portals.patch index 29b752c68e..4fa4694af0 100644 --- a/Spigot-Server-Patches/0276-Call-PortalCreateEvent-for-exit-portals.patch +++ b/Spigot-Server-Patches/0277-Call-PortalCreateEvent-for-exit-portals.patch @@ -1,11 +1,11 @@ -From 8472a7b589378392f3265266928853dbd20174b2 Mon Sep 17 00:00:00 2001 +From 07002b8cac576afa02cc8be735a4f125d9c973cc Mon Sep 17 00:00:00 2001 From: MiniDigger Date: Sun, 18 Mar 2018 15:44:44 +0100 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 @@ -3,10 +3,17 @@ package net.minecraft.server; diff --git a/Spigot-Server-Patches/0277-Player.setPlayerProfile-API.patch b/Spigot-Server-Patches/0278-Player.setPlayerProfile-API.patch similarity index 96% rename from Spigot-Server-Patches/0277-Player.setPlayerProfile-API.patch rename to Spigot-Server-Patches/0278-Player.setPlayerProfile-API.patch index 4f2bf1ff0a..6d6f844fba 100644 --- a/Spigot-Server-Patches/0277-Player.setPlayerProfile-API.patch +++ b/Spigot-Server-Patches/0278-Player.setPlayerProfile-API.patch @@ -1,4 +1,4 @@ -From e19049ea23be5301ab117ae996d6f1a13d9d8528 Mon Sep 17 00:00:00 2001 +From 9ae1f2a102c740bf3ff54f6397741196bfdd8f53 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 18 Mar 2018 12:29:48 -0400 Subject: [PATCH] Player.setPlayerProfile API @@ -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 @@ -59,7 +59,7 @@ 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 @@ -1,6 +1,8 @@ @@ -89,5 +89,5 @@ index 21631c58..87e31cf0 100644 public void removeDisconnectingPlayer(Player player) { hiddenPlayers.remove(player.getUniqueId()); -- -2.16.1.windows.1 +2.16.2