2019-03-20 02:46:00 +01:00
|
|
|
From 0db7caa6c1fffb8a75ca04e449016be2d771c7b0 Mon Sep 17 00:00:00 2001
|
2017-06-17 23:15:25 +02:00
|
|
|
From: Aikar <aikar@aikar.co>
|
|
|
|
Date: Sat, 17 Jun 2017 17:00:32 -0400
|
|
|
|
Subject: [PATCH] Profile Lookup Events
|
|
|
|
|
|
|
|
Adds a Pre Lookup Event and a Post Lookup Event so that plugins may prefill in profile data, and cache the responses from
|
|
|
|
profiles that had to be looked up.
|
|
|
|
|
2018-05-11 05:01:52 +02:00
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java b/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java
|
2018-11-12 19:23:18 +01:00
|
|
|
index 3bcdb8f93..bb9894318 100644
|
2018-05-11 05:01:52 +02:00
|
|
|
--- a/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java
|
|
|
|
@@ -1,17 +1,68 @@
|
|
|
|
package com.destroystokyo.paper.profile;
|
|
|
|
|
2018-01-19 06:03:09 +01:00
|
|
|
+import com.destroystokyo.paper.event.profile.LookupProfileEvent;
|
|
|
|
+import com.destroystokyo.paper.event.profile.PreLookupProfileEvent;
|
|
|
|
+import com.google.common.collect.Sets;
|
2018-05-11 05:01:52 +02:00
|
|
|
import com.mojang.authlib.Agent;
|
2018-01-19 06:03:09 +01:00
|
|
|
+import com.mojang.authlib.GameProfile;
|
2018-05-11 05:01:52 +02:00
|
|
|
import com.mojang.authlib.ProfileLookupCallback;
|
|
|
|
import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService;
|
|
|
|
import com.mojang.authlib.yggdrasil.YggdrasilGameProfileRepository;
|
|
|
|
|
2018-01-19 06:03:09 +01:00
|
|
|
+import java.util.Set;
|
|
|
|
+
|
2018-05-11 05:01:52 +02:00
|
|
|
public class PaperGameProfileRepository extends YggdrasilGameProfileRepository {
|
2018-01-19 06:03:09 +01:00
|
|
|
+
|
2018-05-11 05:01:52 +02:00
|
|
|
public PaperGameProfileRepository(YggdrasilAuthenticationService authenticationService) {
|
|
|
|
super(authenticationService);
|
|
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
|
|
public void findProfilesByNames(String[] names, Agent agent, ProfileLookupCallback callback) {
|
|
|
|
- super.findProfilesByNames(names, agent, callback);
|
2018-01-19 06:03:09 +01:00
|
|
|
+ Set<String> unfoundNames = Sets.newHashSet();
|
|
|
|
+ for (String name : names) {
|
|
|
|
+ PreLookupProfileEvent event = new PreLookupProfileEvent(name);
|
|
|
|
+ event.callEvent();
|
|
|
|
+ if (event.getUUID() != null) {
|
|
|
|
+ // Plugin provided UUI, we can skip network call.
|
|
|
|
+ GameProfile gameprofile = new GameProfile(event.getUUID(), name);
|
|
|
|
+ // We might even have properties!
|
|
|
|
+ Set<ProfileProperty> profileProperties = event.getProfileProperties();
|
|
|
|
+ if (!profileProperties.isEmpty()) {
|
|
|
|
+ for (ProfileProperty property : profileProperties) {
|
|
|
|
+ gameprofile.getProperties().put(property.getName(), CraftPlayerProfile.asAuthlib(property));
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ callback.onProfileLookupSucceeded(gameprofile);
|
|
|
|
+ } else {
|
|
|
|
+ unfoundNames.add(name);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ // Some things were not found.... Proceed to look up.
|
|
|
|
+ if (!unfoundNames.isEmpty()) {
|
|
|
|
+ String[] namesArr = unfoundNames.toArray(new String[unfoundNames.size()]);
|
2018-05-11 05:01:52 +02:00
|
|
|
+ super.findProfilesByNames(namesArr, agent, new PreProfileLookupCallback(callback));
|
2018-01-19 06:03:09 +01:00
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ private static class PreProfileLookupCallback implements ProfileLookupCallback {
|
|
|
|
+ private final ProfileLookupCallback callback;
|
|
|
|
+
|
|
|
|
+ PreProfileLookupCallback(ProfileLookupCallback callback) {
|
|
|
|
+ this.callback = callback;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public void onProfileLookupSucceeded(GameProfile gameProfile) {
|
2018-01-19 06:38:49 +01:00
|
|
|
+ PlayerProfile from = CraftPlayerProfile.asBukkitMirror(gameProfile);
|
2018-01-19 06:03:09 +01:00
|
|
|
+ new LookupProfileEvent(from).callEvent();
|
|
|
|
+ callback.onProfileLookupSucceeded(gameProfile);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public void onProfileLookupFailed(GameProfile gameProfile, Exception e) {
|
|
|
|
+ callback.onProfileLookupFailed(gameProfile, e);
|
|
|
|
+ }
|
2018-05-11 05:01:52 +02:00
|
|
|
}
|
|
|
|
}
|
2017-06-17 23:15:25 +02:00
|
|
|
--
|
2019-03-20 02:46:00 +01:00
|
|
|
2.21.0
|
2017-06-17 23:15:25 +02:00
|
|
|
|