diff options
| author | BlackHole <[email protected]> | 2018-11-08 19:00:27 -0500 |
|---|---|---|
| committer | Zach Brown <[email protected]> | 2018-11-08 19:00:27 -0500 |
| commit | 531dfad2d23a238531caf29afa738cd3986b7e75 (patch) | |
| tree | 2dcab6de948eee96bed3eaa27d2a17fe3962d4eb | |
| parent | 67787d388c887020c8053e6626138ad7e984cc8f (diff) | |
| download | Paper-531dfad2d23a238531caf29afa738cd3986b7e75.tar.gz Paper-531dfad2d23a238531caf29afa738cd3986b7e75.zip | |
Fix PreFillProfileEvent
| -rw-r--r-- | Spigot-Server-Patches/0264-Fill-Profile-Property-Events.patch | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/Spigot-Server-Patches/0264-Fill-Profile-Property-Events.patch b/Spigot-Server-Patches/0264-Fill-Profile-Property-Events.patch index e668ddc081..427b0554ff 100644 --- a/Spigot-Server-Patches/0264-Fill-Profile-Property-Events.patch +++ b/Spigot-Server-Patches/0264-Fill-Profile-Property-Events.patch @@ -1,4 +1,4 @@ -From 7de0f8add5f32e662c9354154f52a63942cb1274 Mon Sep 17 00:00:00 2001 +From bb3e56dcc9c689402ea30a5cdd9e009a84022109 Mon Sep 17 00:00:00 2001 From: Aikar <[email protected]> Date: Tue, 2 Jan 2018 00:31:26 -0500 Subject: [PATCH] Fill Profile Property Events @@ -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 4b2a67423..f83aa5ef0 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 @@ -1,5 +1,7 @@ @@ -22,12 +22,14 @@ index 4b2a67423..f83aa5ef0 100644 import com.mojang.authlib.GameProfile; import com.mojang.authlib.minecraft.MinecraftProfileTexture; import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService; -@@ -19,7 +21,13 @@ public class PaperMinecraftSessionService extends YggdrasilMinecraftSessionServi +@@ -19,7 +21,15 @@ public class PaperMinecraftSessionService extends YggdrasilMinecraftSessionServi @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; + } @@ -38,5 +40,5 @@ index 4b2a67423..f83aa5ef0 100644 @Override -- -2.18.0 +2.19.1 |