diff --git a/Spigot-Server-Patches/Fill-Profile-Property-Events.patch b/Spigot-Server-Patches/Fill-Profile-Property-Events.patch index 0dcee7f7f..e00c8bd90 100644 --- a/Spigot-Server-Patches/Fill-Profile-Property-Events.patch +++ b/Spigot-Server-Patches/Fill-Profile-Property-Events.patch @@ -11,7 +11,7 @@ If Mojang API does need to be hit, event fire so you can get the results. This is useful for implementing a ProfileCache for Player Skulls diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java b/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java -index 4b2a67423f..f83aa5ef0f 100644 +index 4b2a67423f..61cfdf73c8 100644 --- a/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java +++ b/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java @@ -0,0 +0,0 @@ @@ -27,7 +27,9 @@ index 4b2a67423f..f83aa5ef0f 100644 @Override public GameProfile fillProfileProperties(GameProfile profile, boolean requireSecure) { - return super.fillProfileProperties(profile, requireSecure); -+ new PreFillProfileEvent(CraftPlayerProfile.asBukkitMirror(profile)).callEvent(); ++ CraftPlayerProfile playerProfile = (CraftPlayerProfile) CraftPlayerProfile.asBukkitMirror(profile); ++ new PreFillProfileEvent(playerProfile).callEvent(); ++ profile = playerProfile.getGameProfile(); + if (profile.isComplete() && profile.getProperties().containsKey("textures")) { + return profile; + } diff --git a/Spigot-Server-Patches/Fix-PreFillProfileEvent.patch b/Spigot-Server-Patches/Fix-PreFillProfileEvent.patch deleted file mode 100644 index cf02edb57..000000000 --- a/Spigot-Server-Patches/Fix-PreFillProfileEvent.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: BlackHole -Date: Thu, 8 Nov 2018 20:04:11 +0100 -Subject: [PATCH] Fix PreFillProfileEvent - - -diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java b/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java -index f83aa5ef0..61cfdf73c 100644 ---- a/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java -+++ b/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java -@@ -0,0 +0,0 @@ public class PaperMinecraftSessionService extends YggdrasilMinecraftSessionServi - - @Override - public GameProfile fillProfileProperties(GameProfile profile, boolean requireSecure) { -- new PreFillProfileEvent(CraftPlayerProfile.asBukkitMirror(profile)).callEvent(); -+ CraftPlayerProfile playerProfile = (CraftPlayerProfile) CraftPlayerProfile.asBukkitMirror(profile); -+ new PreFillProfileEvent(playerProfile).callEvent(); -+ profile = playerProfile.getGameProfile(); - if (profile.isComplete() && profile.getProperties().containsKey("textures")) { - return profile; - } --- \ No newline at end of file