2020-05-06 09:48:49 +00:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2018-01-16 03:13:17 +00:00
From: Aikar <aikar@aikar.co>
Date: Mon, 15 Jan 2018 22:11:48 -0500
Subject: [PATCH] Basic PlayerProfile API
2018-05-11 03:01:52 +00:00
Establishes base extension of profile systems for future edits too
2018-01-16 03:13:17 +00:00
2018-01-19 05:03:09 +00:00
diff --git a/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java
2018-01-16 03:13:17 +00:00
new file mode 100644
2020-05-06 09:48:49 +00:00
index 0000000000000000000000000000000000000000..b151a13c1b9058eb057081ef8a64558028443a07
2018-01-16 03:13:17 +00:00
--- /dev/null
2018-01-19 05:03:09 +00:00
+++ b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java
2018-07-31 05:37:41 +00:00
@@ -0,0 +1,280 @@
2018-01-16 03:13:17 +00:00
+package com.destroystokyo.paper.profile;
+
2018-03-22 05:28:22 +00:00
+import com.destroystokyo.paper.PaperConfig;
+import com.google.common.base.Charsets;
2018-01-16 03:13:17 +00:00
+import com.mojang.authlib.GameProfile;
+import com.mojang.authlib.properties.Property;
+import com.mojang.authlib.properties.PropertyMap;
2018-03-18 15:31:32 +00:00
+import net.minecraft.server.MinecraftServer;
2018-03-26 01:50:46 +00:00
+import net.minecraft.server.UserCache;
2018-03-22 05:28:22 +00:00
+import org.bukkit.craftbukkit.entity.CraftPlayer;
+import org.spigotmc.SpigotConfig;
2018-01-16 03:13:17 +00:00
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
2018-01-21 19:09:09 +00:00
+import java.util.AbstractSet;
2018-01-16 03:13:17 +00:00
+import java.util.Collection;
2018-01-21 19:09:09 +00:00
+import java.util.Iterator;
2018-03-23 01:56:18 +00:00
+import java.util.Objects;
2018-01-16 03:13:17 +00:00
+import java.util.Set;
+import java.util.UUID;
+
2018-01-19 05:03:09 +00:00
+public class CraftPlayerProfile implements PlayerProfile {
2018-01-16 03:13:17 +00:00
+
2018-03-18 15:31:32 +00:00
+ private GameProfile profile;
2018-03-23 01:40:57 +00:00
+ private final PropertySet properties = new PropertySet();
2018-01-16 03:13:17 +00:00
+
2018-03-22 05:28:22 +00:00
+ public CraftPlayerProfile(CraftPlayer player) {
2018-03-23 01:40:57 +00:00
+ this.profile = player.getHandle().getProfile();
+ }
+
2018-01-19 05:03:09 +00:00
+ public CraftPlayerProfile(UUID id, String name) {
2018-03-26 00:05:30 +00:00
+ this.profile = new GameProfile(id, name);
2018-03-23 01:40:57 +00:00
+ }
+
+ public CraftPlayerProfile(GameProfile profile) {
+ this.profile = profile;
2018-03-22 05:28:22 +00:00
+ }
+
2018-03-26 00:05:30 +00:00
+ @Override
+ public boolean hasProperty(String property) {
+ return profile.getProperties().containsKey(property);
+ }
2018-03-22 05:28:22 +00:00
+
2018-03-26 00:05:30 +00:00
+ @Override
+ public void setProperty(ProfileProperty property) {
+ String name = property.getName();
+ PropertyMap properties = profile.getProperties();
+ properties.removeAll(name);
+ properties.put(name, new Property(name, property.getValue(), property.getSignature()));
2018-03-22 05:28:22 +00:00
+ }
+
2018-03-26 00:05:30 +00:00
+ public GameProfile getGameProfile() {
2018-03-23 01:40:57 +00:00
+ return profile;
+ }
+
2018-03-26 00:05:30 +00:00
+ @Nullable
+ @Override
+ public UUID getId() {
+ return profile.getId();
2018-01-16 03:13:17 +00:00
+ }
+
2018-03-26 01:50:46 +00:00
+ @Override
+ public UUID setId(@Nullable UUID uuid) {
+ GameProfile prev = this.profile;
+ this.profile = new GameProfile(uuid, prev.getName());
+ copyProfileProperties(prev, this.profile);
+ return prev.getId();
+ }
+
2018-03-26 00:05:30 +00:00
+ @Nullable
2018-01-16 03:13:17 +00:00
+ @Override
2018-03-26 00:05:30 +00:00
+ public String getName() {
+ return profile.getName();
2018-01-19 05:38:49 +00:00
+ }
+
2018-03-26 01:50:46 +00:00
+ @Override
+ public String setName(@Nullable String name) {
+ GameProfile prev = this.profile;
+ this.profile = new GameProfile(prev.getId(), name);
+ copyProfileProperties(prev, this.profile);
+ return prev.getName();
+ }
+
2018-03-26 00:05:30 +00:00
+ @Nonnull
2018-01-19 05:38:49 +00:00
+ @Override
2018-03-26 00:05:30 +00:00
+ public Set<ProfileProperty> getProperties() {
+ return properties;
2018-01-16 03:13:17 +00:00
+ }
+
+ @Override
+ public void setProperties(Collection<ProfileProperty> properties) {
+ properties.forEach(this::setProperty);
+ }
+
+ @Override
2018-03-26 00:05:30 +00:00
+ public void clearProperties() {
+ profile.getProperties().clear();
+ }
+
+ @Override
2018-01-16 03:13:17 +00:00
+ public boolean removeProperty(String property) {
+ return !profile.getProperties().removeAll(property).isEmpty();
+ }
+
+ @Override
2018-03-26 00:05:30 +00:00
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+ CraftPlayerProfile that = (CraftPlayerProfile) o;
+ return Objects.equals(profile, that.profile);
+ }
+
+ @Override
+ public int hashCode() {
+ return profile.hashCode();
+ }
+
+ @Override
+ public String toString() {
+ return profile.toString();
+ }
+
+ @Override
+ public CraftPlayerProfile clone() {
+ CraftPlayerProfile clone = new CraftPlayerProfile(this.getId(), this.getName());
+ clone.setProperties(getProperties());
+ return clone;
2018-01-16 03:13:17 +00:00
+ }
+
+ @Override
+ public boolean isComplete() {
+ return profile.isComplete();
+ }
+
2018-03-26 01:50:46 +00:00
+ @Override
+ public boolean completeFromCache() {
+ return completeFromCache(false);
+ }
+
+ public boolean completeFromCache(boolean lookupName) {
2018-04-08 16:28:04 +00:00
+ if (profile.isComplete()) {
+ return true;
+ }
2018-03-23 01:40:57 +00:00
+ MinecraftServer server = MinecraftServer.getServer();
+ String name = profile.getName();
2018-03-26 01:50:46 +00:00
+ UserCache userCache = server.getUserCache();
2018-03-23 01:40:57 +00:00
+ if (profile.getId() == null) {
2018-03-26 01:50:46 +00:00
+ final GameProfile profile;
+ boolean isOnlineMode = server.getOnlineMode() || (SpigotConfig.bungee && PaperConfig.bungeeOnlineMode);
+ if (isOnlineMode) {
+ profile = lookupName ? userCache.getProfile(name) : userCache.getProfileIfCached(name);
+ } else {
+ // Make an OfflinePlayer using an offline mode UUID since the name has no profile
+ profile = new GameProfile(UUID.nameUUIDFromBytes(("OfflinePlayer:" + name).getBytes(Charsets.UTF_8)), name);
+ }
2018-07-31 05:37:41 +00:00
+ if (profile != null) {
+ this.profile = profile;
2018-03-23 01:40:57 +00:00
+ }
+ }
2018-03-26 01:50:46 +00:00
+
+ if (profile.getName() == null) {
2018-03-26 00:05:30 +00:00
+ // If we need textures, skip this check, as we will get it below anyways.
2018-03-26 01:50:46 +00:00
+ GameProfile profile = userCache.getProfile(this.profile.getId());
2018-03-26 00:05:30 +00:00
+ if (profile != null) {
+ this.profile = profile;
+ }
+ }
2018-03-26 01:50:46 +00:00
+ return this.profile.isComplete();
+ }
+
+ public boolean complete(boolean textures) {
+ MinecraftServer server = MinecraftServer.getServer();
+
2018-04-08 16:28:04 +00:00
+ boolean isOnlineMode = server.getOnlineMode() || (SpigotConfig.bungee && PaperConfig.bungeeOnlineMode);
+ boolean isCompleteFromCache = this.completeFromCache(true);
+ if (isOnlineMode && (!isCompleteFromCache || textures && !hasTextures())) {
2018-03-23 01:40:57 +00:00
+ GameProfile result = server.getSessionService().fillProfileProperties(profile, true);
2018-03-22 05:28:22 +00:00
+ if (result != null) {
+ this.profile = result;
+ }
2018-03-21 23:12:02 +00:00
+ }
2018-04-08 16:28:04 +00:00
+ return profile.isComplete() && (!isOnlineMode || !textures || hasTextures());
2018-03-18 15:31:32 +00:00
+ }
+
2018-03-26 00:05:30 +00:00
+ private static void copyProfileProperties(GameProfile source, GameProfile target) {
2018-03-26 01:50:46 +00:00
+ PropertyMap sourceProperties = source.getProperties();
+ if (sourceProperties.isEmpty()) {
+ return;
+ }
2018-03-26 00:05:30 +00:00
+ PropertyMap properties = target.getProperties();
+ properties.clear();
2018-03-26 01:50:46 +00:00
+
+ for (Property property : sourceProperties.values()) {
2018-03-26 00:05:30 +00:00
+ properties.put(property.getName(), property);
+ }
+ }
+
2018-01-19 05:03:09 +00:00
+ private static ProfileProperty toBukkit(Property property) {
2018-01-16 03:13:17 +00:00
+ return new ProfileProperty(property.getName(), property.getValue(), property.getSignature());
+ }
2018-01-19 05:03:09 +00:00
+
2018-01-19 05:38:49 +00:00
+ public static PlayerProfile asBukkitCopy(GameProfile gameProfile) {
2018-03-22 05:28:22 +00:00
+ CraftPlayerProfile profile = new CraftPlayerProfile(gameProfile.getId(), gameProfile.getName());
+ copyProfileProperties(gameProfile, profile.profile);
2018-01-19 05:03:09 +00:00
+ return profile;
+ }
+
2018-01-19 05:38:49 +00:00
+ public static PlayerProfile asBukkitMirror(GameProfile profile) {
+ return new CraftPlayerProfile(profile);
+ }
+
2018-01-19 05:03:09 +00:00
+ public static Property asAuthlib(ProfileProperty property) {
+ return new Property(property.getName(), property.getValue(), property.getSignature());
+ }
2018-03-26 00:05:30 +00:00
+
2018-01-19 05:38:49 +00:00
+ public static GameProfile asAuthlibCopy(PlayerProfile profile) {
+ CraftPlayerProfile craft = ((CraftPlayerProfile) profile);
+ return asAuthlib(craft.clone());
+ }
+
+ public static GameProfile asAuthlib(PlayerProfile profile) {
+ CraftPlayerProfile craft = ((CraftPlayerProfile) profile);
+ return craft.getGameProfile();
+ }
2018-01-21 19:09:09 +00:00
+
+ private class PropertySet extends AbstractSet<ProfileProperty> {
+
+ @Override
2018-03-08 02:03:01 +00:00
+ @Nonnull
2018-01-21 19:09:09 +00:00
+ public Iterator<ProfileProperty> iterator() {
2018-03-08 02:03:01 +00:00
+ return new ProfilePropertyIterator(profile.getProperties().values().iterator());
2018-01-21 19:09:09 +00:00
+ }
+
+ @Override
+ public int size() {
+ return profile.getProperties().size();
+ }
+
+ @Override
+ public boolean add(ProfileProperty property) {
+ setProperty(property);
+ return true;
+ }
+
+ @Override
+ public boolean addAll(Collection<? extends ProfileProperty> c) {
+ //noinspection unchecked
+ setProperties((Collection<ProfileProperty>) c);
+ return true;
+ }
+
+ @Override
+ public boolean contains(Object o) {
+ return o instanceof ProfileProperty && profile.getProperties().containsKey(((ProfileProperty) o).getName());
+ }
2018-03-08 02:03:01 +00:00
+
+ private class ProfilePropertyIterator implements Iterator<ProfileProperty> {
+ private final Iterator<Property> iterator;
+
+ ProfilePropertyIterator(Iterator<Property> iterator) {
+ this.iterator = iterator;
+ }
+
+ @Override
+ public boolean hasNext() {
+ return iterator.hasNext();
+ }
+
+ @Override
+ public ProfileProperty next() {
+ return toBukkit(iterator.next());
+ }
+
+ @Override
+ public void remove() {
+ iterator.remove();
+ }
+ }
2018-01-21 19:09:09 +00:00
+ }
2018-01-16 03:13:17 +00:00
+}
2018-05-11 03:01:52 +00:00
diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperAuthenticationService.java b/src/main/java/com/destroystokyo/paper/profile/PaperAuthenticationService.java
new file mode 100644
2020-05-06 09:48:49 +00:00
index 0000000000000000000000000000000000000000..25836b975b51af701d4b9523ab398fbf157b82fd
2018-05-11 03:01:52 +00:00
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/profile/PaperAuthenticationService.java
@@ -0,0 +1,30 @@
+package com.destroystokyo.paper.profile;
+
+import com.mojang.authlib.Agent;
+import com.mojang.authlib.GameProfileRepository;
+import com.mojang.authlib.UserAuthentication;
+import com.mojang.authlib.minecraft.MinecraftSessionService;
+import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService;
+
+import java.net.Proxy;
+
+public class PaperAuthenticationService extends YggdrasilAuthenticationService {
+ public PaperAuthenticationService(Proxy proxy, String clientToken) {
+ super(proxy, clientToken);
+ }
+
+ @Override
+ public UserAuthentication createUserAuthentication(Agent agent) {
+ return new PaperUserAuthentication(this, agent);
+ }
+
+ @Override
+ public MinecraftSessionService createMinecraftSessionService() {
+ return new PaperMinecraftSessionService(this);
+ }
+
+ @Override
+ public GameProfileRepository createProfileRepository() {
+ return new PaperGameProfileRepository(this);
+ }
+}
diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java b/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java
new file mode 100644
2020-05-06 09:48:49 +00:00
index 0000000000000000000000000000000000000000..3bcdb8f93f1930ee53395470ffb3833e2bd75222
2018-05-11 03:01:52 +00:00
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java
@@ -0,0 +1,17 @@
+package com.destroystokyo.paper.profile;
+
+import com.mojang.authlib.Agent;
+import com.mojang.authlib.ProfileLookupCallback;
+import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService;
+import com.mojang.authlib.yggdrasil.YggdrasilGameProfileRepository;
+
+public class PaperGameProfileRepository extends YggdrasilGameProfileRepository {
+ public PaperGameProfileRepository(YggdrasilAuthenticationService authenticationService) {
+ super(authenticationService);
+ }
+
+ @Override
+ public void findProfilesByNames(String[] names, Agent agent, ProfileLookupCallback callback) {
+ super.findProfilesByNames(names, agent, callback);
+ }
+}
diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java b/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java
new file mode 100644
2020-05-06 09:48:49 +00:00
index 0000000000000000000000000000000000000000..4b2a67423f57b70d316115e4525e3841a415b1cc
2018-05-11 03:01:52 +00:00
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java
@@ -0,0 +1,29 @@
+package com.destroystokyo.paper.profile;
+
+import com.mojang.authlib.GameProfile;
+import com.mojang.authlib.minecraft.MinecraftProfileTexture;
+import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService;
+import com.mojang.authlib.yggdrasil.YggdrasilMinecraftSessionService;
+
+import java.util.Map;
+
+public class PaperMinecraftSessionService extends YggdrasilMinecraftSessionService {
+ protected PaperMinecraftSessionService(YggdrasilAuthenticationService authenticationService) {
+ super(authenticationService);
+ }
+
+ @Override
+ public Map<MinecraftProfileTexture.Type, MinecraftProfileTexture> getTextures(GameProfile profile, boolean requireSecure) {
+ return super.getTextures(profile, requireSecure);
+ }
+
+ @Override
+ public GameProfile fillProfileProperties(GameProfile profile, boolean requireSecure) {
+ return super.fillProfileProperties(profile, requireSecure);
+ }
+
+ @Override
+ protected GameProfile fillGameProfile(GameProfile profile, boolean requireSecure) {
+ return super.fillGameProfile(profile, requireSecure);
+ }
+}
diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperUserAuthentication.java b/src/main/java/com/destroystokyo/paper/profile/PaperUserAuthentication.java
new file mode 100644
2020-05-06 09:48:49 +00:00
index 0000000000000000000000000000000000000000..3aceb0ea8a1a3ed94dd8a9e954c52ecd341c6bd1
2018-05-11 03:01:52 +00:00
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/profile/PaperUserAuthentication.java
@@ -0,0 +1,11 @@
+package com.destroystokyo.paper.profile;
+
+import com.mojang.authlib.Agent;
+import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService;
+import com.mojang.authlib.yggdrasil.YggdrasilUserAuthentication;
+
+public class PaperUserAuthentication extends YggdrasilUserAuthentication {
+ public PaperUserAuthentication(YggdrasilAuthenticationService authenticationService, Agent agent) {
+ super(authenticationService, agent);
+ }
+}
2018-01-19 05:12:03 +00:00
diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
2020-05-19 08:01:53 +00:00
index f9a7a1e9eea67bafb85c0ed88e96abb8e45f6c81..8ca1a4719d934db31d57b34cf7050acc5a1a7048 100644
2018-01-19 05:12:03 +00:00
--- a/src/main/java/net/minecraft/server/MCUtil.java
+++ b/src/main/java/net/minecraft/server/MCUtil.java
2018-09-03 23:59:54 +00:00
@@ -1,7 +1,10 @@
2018-01-19 05:12:03 +00:00
package net.minecraft.server;
2018-09-03 23:59:54 +00:00
import com.destroystokyo.paper.block.TargetBlockInfo;
2018-01-19 05:12:03 +00:00
+import com.destroystokyo.paper.profile.CraftPlayerProfile;
+import com.destroystokyo.paper.profile.PlayerProfile;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import com.mojang.authlib.GameProfile;
import org.apache.commons.lang.exception.ExceptionUtils;
import org.bukkit.Location;
2018-09-03 23:59:54 +00:00
import org.bukkit.block.BlockFace;
2020-05-19 08:01:53 +00:00
@@ -329,6 +332,10 @@ public final class MCUtil {
2018-01-19 05:12:03 +00:00
return run.get();
}
+ public static PlayerProfile toBukkit(GameProfile profile) {
2018-01-19 05:38:49 +00:00
+ return CraftPlayerProfile.asBukkitMirror(profile);
2018-01-19 05:12:03 +00:00
+ }
+
/**
* Calculates distance between 2 entities
* @param e1
2018-03-18 15:31:32 +00:00
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
2020-05-17 01:38:19 +00:00
index 87595425a358a13c8f2393619d51a981140556cf..4a513aaea587414cf6abc1c136e52420d59688d8 100644
2018-03-18 15:31:32 +00:00
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
2020-05-17 01:38:19 +00:00
@@ -1304,7 +1304,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
2019-04-27 06:26:04 +00:00
DispenserRegistry.init();
DispenserRegistry.c();
2020-01-22 02:02:07 +00:00
File s = (File) optionset.valueOf("universe"); // CraftBukkit
2018-05-11 03:01:52 +00:00
- YggdrasilAuthenticationService yggdrasilauthenticationservice = new YggdrasilAuthenticationService(Proxy.NO_PROXY, UUID.randomUUID().toString());
+ YggdrasilAuthenticationService yggdrasilauthenticationservice = new com.destroystokyo.paper.profile.PaperAuthenticationService(Proxy.NO_PROXY, UUID.randomUUID().toString()); // Paper
MinecraftSessionService minecraftsessionservice = yggdrasilauthenticationservice.createMinecraftSessionService();
GameProfileRepository gameprofilerepository = yggdrasilauthenticationservice.createProfileRepository();
2019-04-27 06:26:04 +00:00
UserCache usercache = new UserCache(gameprofilerepository, new File(s, MinecraftServer.b.getName()));
2020-05-17 01:38:19 +00:00
@@ -1769,6 +1769,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
2019-07-20 04:01:24 +00:00
this.H = i;
2018-03-18 15:31:32 +00:00
}
2019-04-27 06:26:04 +00:00
+ public final MinecraftSessionService getSessionService() { return this.getMinecraftSessionService(); } // Paper - OBFHELPER
public MinecraftSessionService getMinecraftSessionService() {
return this.minecraftSessionService;
2018-03-18 15:31:32 +00:00
}
2018-03-26 01:50:46 +00:00
diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java
2020-05-06 09:48:49 +00:00
index 581199e6dcddb3692ccc6b6cf6c42fa5ef1f5e7e..a072222bc5b8b1b62990bce35034b09ebf270865 100644
2018-03-26 01:50:46 +00:00
--- a/src/main/java/net/minecraft/server/UserCache.java
+++ b/src/main/java/net/minecraft/server/UserCache.java
2019-01-01 03:15:55 +00:00
@@ -43,7 +43,7 @@ public class UserCache {
2018-03-26 01:50:46 +00:00
public static final SimpleDateFormat a = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z");
private static boolean c;
2019-05-27 06:17:50 +00:00
- private final Map<String, UserCache.UserCacheEntry> d = new java.util.concurrent.ConcurrentHashMap<>(); // Paper
+ private final Map<String, UserCache.UserCacheEntry> d = new java.util.concurrent.ConcurrentHashMap<>();private final Map<String, UserCache.UserCacheEntry> nameCache = d; // Paper - OBFHELPER // Paper
private final Map<UUID, UserCache.UserCacheEntry> e = new java.util.concurrent.ConcurrentHashMap<>(); // Paper
2018-03-26 01:50:46 +00:00
private final Deque<GameProfile> f = new java.util.concurrent.LinkedBlockingDeque<GameProfile>(); // CraftBukkit
private final GameProfileRepository g;
2019-01-01 03:15:55 +00:00
@@ -165,6 +165,13 @@ public class UserCache {
2018-07-18 00:08:13 +00:00
return usercache_usercacheentry == null ? null : usercache_usercacheentry.a();
2018-03-26 01:50:46 +00:00
}
+ // Paper start
+ @Nullable public GameProfile getProfileIfCached(String name) {
+ UserCache.UserCacheEntry entry = this.nameCache.get(name.toLowerCase(Locale.ROOT));
+ return entry == null ? null : entry.getProfile();
+ }
+ // Paper end
+
@Nullable
2019-12-11 23:43:22 +00:00
public GameProfile getProfile(UUID uuid) {
2019-12-13 01:18:18 +00:00
UserCache.UserCacheEntry usercache_usercacheentry = (UserCache.UserCacheEntry) this.e.get(uuid);
@@ -273,7 +280,7 @@ public class UserCache {
2018-03-26 01:50:46 +00:00
class UserCacheEntry {
- private final GameProfile b;
+ private final GameProfile b;public GameProfile getProfile() { return b; } // Paper - OBFHELPER
private final Date c;
private UserCacheEntry(GameProfile gameprofile, Date date) {
2018-01-16 03:13:17 +00:00
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
2020-05-06 09:48:49 +00:00
index f01bd38d0b600a69224f610fd77a542ec6d1c322..95f4abddf57eb8c59cb5a5410b8d551d39f94fd7 100644
2018-01-16 03:13:17 +00:00
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
2020-04-27 07:34:45 +00:00
@@ -200,6 +200,9 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
2019-04-27 06:26:04 +00:00
import net.md_5.bungee.api.chat.BaseComponent; // Spigot
2018-01-16 03:13:17 +00:00
+import javax.annotation.Nullable; // Paper
+import javax.annotation.Nonnull; // Paper
+
public final class CraftServer implements Server {
2018-07-18 00:08:13 +00:00
private final String serverName = "Paper"; // Paper
2018-01-16 03:13:17 +00:00
private final String serverVersion;
2020-04-27 07:34:45 +00:00
@@ -2154,5 +2157,24 @@ public final class CraftServer implements Server {
2018-01-16 03:13:17 +00:00
public boolean suggestPlayerNamesWhenNullTabCompletions() {
return com.destroystokyo.paper.PaperConfig.suggestPlayersWhenNullTabCompletions;
}
+
2019-04-27 06:26:04 +00:00
+ @Override
2018-01-16 03:13:17 +00:00
+ public com.destroystokyo.paper.profile.PlayerProfile createProfile(@Nonnull UUID uuid) {
+ return createProfile(uuid, null);
+ }
+
2019-04-27 06:26:04 +00:00
+ @Override
2018-01-16 03:13:17 +00:00
+ public com.destroystokyo.paper.profile.PlayerProfile createProfile(@Nonnull String name) {
+ return createProfile(null, name);
+ }
+
2019-04-27 06:26:04 +00:00
+ @Override
2018-01-16 03:13:17 +00:00
+ public com.destroystokyo.paper.profile.PlayerProfile createProfile(@Nullable UUID uuid, @Nullable String name) {
2018-03-22 05:28:22 +00:00
+ Player player = uuid != null ? Bukkit.getPlayer(uuid) : (name != null ? Bukkit.getPlayerExact(name) : null);
+ if (player != null) {
+ return new com.destroystokyo.paper.profile.CraftPlayerProfile((CraftPlayer)player);
+ }
2018-01-19 05:03:09 +00:00
+ return new com.destroystokyo.paper.profile.CraftPlayerProfile(uuid, name);
2018-01-16 03:13:17 +00:00
+ }
// Paper end
}