64ed429884
This is a pretty tiny update with very little changed. Recommended to update from 1.16.2 ASAP as 1.16.2 is now no longer supported. Plugins should mostly remain working as the NMS revision did not change.
567 Zeilen
23 KiB
Diff
567 Zeilen
23 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Mon, 15 Jan 2018 22:11:48 -0500
|
|
Subject: [PATCH] Basic PlayerProfile API
|
|
|
|
Establishes base extension of profile systems for future edits too
|
|
|
|
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 0000000000000000000000000000000000000000..2751ce7f1556da07ef853807a588f096adf6ef7f
|
|
--- /dev/null
|
|
+++ b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java
|
|
@@ -0,0 +1,297 @@
|
|
+package com.destroystokyo.paper.profile;
|
|
+
|
|
+import com.destroystokyo.paper.PaperConfig;
|
|
+import com.google.common.base.Charsets;
|
|
+import com.mojang.authlib.GameProfile;
|
|
+import com.mojang.authlib.properties.Property;
|
|
+import com.mojang.authlib.properties.PropertyMap;
|
|
+import net.minecraft.server.MinecraftServer;
|
|
+import net.minecraft.server.UserCache;
|
|
+import org.apache.commons.lang3.Validate;
|
|
+import org.bukkit.craftbukkit.entity.CraftPlayer;
|
|
+import org.spigotmc.SpigotConfig;
|
|
+
|
|
+import javax.annotation.Nonnull;
|
|
+import javax.annotation.Nullable;
|
|
+import java.util.AbstractSet;
|
|
+import java.util.Collection;
|
|
+import java.util.Iterator;
|
|
+import java.util.Objects;
|
|
+import java.util.Set;
|
|
+import java.util.UUID;
|
|
+
|
|
+public class CraftPlayerProfile implements PlayerProfile {
|
|
+
|
|
+ private GameProfile profile;
|
|
+ private final PropertySet properties = new PropertySet();
|
|
+
|
|
+ public CraftPlayerProfile(CraftPlayer player) {
|
|
+ this.profile = player.getHandle().getProfile();
|
|
+ }
|
|
+
|
|
+ public CraftPlayerProfile(UUID id, String name) {
|
|
+ this.profile = new GameProfile(id, name);
|
|
+ }
|
|
+
|
|
+ public CraftPlayerProfile(GameProfile profile) {
|
|
+ Validate.notNull(profile, "GameProfile cannot be null!");
|
|
+ this.profile = profile;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean hasProperty(String property) {
|
|
+ return profile.getProperties().containsKey(property);
|
|
+ }
|
|
+
|
|
+ @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()));
|
|
+ }
|
|
+
|
|
+ public GameProfile getGameProfile() {
|
|
+ return profile;
|
|
+ }
|
|
+
|
|
+ @Nullable
|
|
+ @Override
|
|
+ public UUID getId() {
|
|
+ return profile.getId();
|
|
+ }
|
|
+
|
|
+ @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();
|
|
+ }
|
|
+
|
|
+ @Nullable
|
|
+ @Override
|
|
+ public String getName() {
|
|
+ return profile.getName();
|
|
+ }
|
|
+
|
|
+ @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();
|
|
+ }
|
|
+
|
|
+ @Nonnull
|
|
+ @Override
|
|
+ public Set<ProfileProperty> getProperties() {
|
|
+ return properties;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setProperties(Collection<ProfileProperty> properties) {
|
|
+ properties.forEach(this::setProperty);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void clearProperties() {
|
|
+ profile.getProperties().clear();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean removeProperty(String property) {
|
|
+ return !profile.getProperties().removeAll(property).isEmpty();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ 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;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean isComplete() {
|
|
+ return profile.isComplete();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean completeFromCache() {
|
|
+ MinecraftServer server = MinecraftServer.getServer();
|
|
+ return completeFromCache(false, server.getOnlineMode() || (SpigotConfig.bungee && PaperConfig.bungeeOnlineMode));
|
|
+ }
|
|
+
|
|
+ public boolean completeFromCache(boolean onlineMode) {
|
|
+ return completeFromCache(false, onlineMode);
|
|
+ }
|
|
+
|
|
+ public boolean completeFromCache(boolean lookupUUID, boolean onlineMode) {
|
|
+ MinecraftServer server = MinecraftServer.getServer();
|
|
+ String name = profile.getName();
|
|
+ UserCache userCache = server.getUserCache();
|
|
+ if (profile.getId() == null) {
|
|
+ final GameProfile profile;
|
|
+ if (onlineMode) {
|
|
+ profile = lookupUUID ? 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);
|
|
+ }
|
|
+ if (profile != null) {
|
|
+ // if old has it, assume its newer, so overwrite, else use cached if it was set and ours wasn't
|
|
+ copyProfileProperties(this.profile, profile);
|
|
+ this.profile = profile;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ if ((profile.getName() == null || !hasTextures()) && profile.getId() != null) {
|
|
+ GameProfile profile = userCache.getProfile(this.profile.getId());
|
|
+ if (profile != null) {
|
|
+ // if old has it, assume its newer, so overwrite, else use cached if it was set and ours wasn't
|
|
+ copyProfileProperties(this.profile, profile);
|
|
+ this.profile = profile;
|
|
+ }
|
|
+ }
|
|
+ return this.profile.isComplete();
|
|
+ }
|
|
+
|
|
+ public boolean complete(boolean textures) {
|
|
+ MinecraftServer server = MinecraftServer.getServer();
|
|
+ return complete(textures, server.getOnlineMode() || (SpigotConfig.bungee && PaperConfig.bungeeOnlineMode));
|
|
+ }
|
|
+ public boolean complete(boolean textures, boolean onlineMode) {
|
|
+ MinecraftServer server = MinecraftServer.getServer();
|
|
+
|
|
+ boolean isCompleteFromCache = this.completeFromCache(true, onlineMode);
|
|
+ if (onlineMode && (!isCompleteFromCache || textures && !hasTextures())) {
|
|
+ GameProfile result = server.getMinecraftSessionService().fillProfileProperties(profile, true);
|
|
+ if (result != null) {
|
|
+ copyProfileProperties(result, this.profile, true);
|
|
+ }
|
|
+ if (this.profile.isComplete()) {
|
|
+ server.getUserCache().saveProfile(this.profile);
|
|
+ }
|
|
+ }
|
|
+ return profile.isComplete() && (!onlineMode || !textures || hasTextures());
|
|
+ }
|
|
+
|
|
+ private static void copyProfileProperties(GameProfile source, GameProfile target) {
|
|
+ copyProfileProperties(source, target, false);
|
|
+ }
|
|
+
|
|
+ private static void copyProfileProperties(GameProfile source, GameProfile target, boolean clearTarget) {
|
|
+ PropertyMap sourceProperties = source.getProperties();
|
|
+ PropertyMap targetProperties = target.getProperties();
|
|
+ if (clearTarget) targetProperties.clear();
|
|
+ if (sourceProperties.isEmpty()) {
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ for (Property property : sourceProperties.values()) {
|
|
+ targetProperties.removeAll(property.getName());
|
|
+ targetProperties.put(property.getName(), property);
|
|
+ }
|
|
+ }
|
|
+
|
|
+ private static ProfileProperty toBukkit(Property property) {
|
|
+ return new ProfileProperty(property.getName(), property.getValue(), property.getSignature());
|
|
+ }
|
|
+
|
|
+ public static PlayerProfile asBukkitCopy(GameProfile gameProfile) {
|
|
+ CraftPlayerProfile profile = new CraftPlayerProfile(gameProfile.getId(), gameProfile.getName());
|
|
+ copyProfileProperties(gameProfile, profile.profile);
|
|
+ return profile;
|
|
+ }
|
|
+
|
|
+ public static PlayerProfile asBukkitMirror(GameProfile profile) {
|
|
+ return new CraftPlayerProfile(profile);
|
|
+ }
|
|
+
|
|
+ public static Property asAuthlib(ProfileProperty property) {
|
|
+ return new Property(property.getName(), property.getValue(), property.getSignature());
|
|
+ }
|
|
+
|
|
+ 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();
|
|
+ }
|
|
+
|
|
+ private class PropertySet extends AbstractSet<ProfileProperty> {
|
|
+
|
|
+ @Override
|
|
+ @Nonnull
|
|
+ public Iterator<ProfileProperty> iterator() {
|
|
+ return new ProfilePropertyIterator(profile.getProperties().values().iterator());
|
|
+ }
|
|
+
|
|
+ @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());
|
|
+ }
|
|
+
|
|
+ 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();
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+}
|
|
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
|
|
index 0000000000000000000000000000000000000000..ef9f55afd6bffa8c02c6820295223e5465eed91e
|
|
--- /dev/null
|
|
+++ b/src/main/java/com/destroystokyo/paper/profile/PaperAuthenticationService.java
|
|
@@ -0,0 +1,31 @@
|
|
+package com.destroystokyo.paper.profile;
|
|
+
|
|
+import com.mojang.authlib.*;
|
|
+import com.mojang.authlib.minecraft.MinecraftSessionService;
|
|
+import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService;
|
|
+import com.mojang.authlib.yggdrasil.YggdrasilEnvironment;
|
|
+
|
|
+import java.net.Proxy;
|
|
+
|
|
+public class PaperAuthenticationService extends YggdrasilAuthenticationService {
|
|
+ private final Environment environment;
|
|
+ public PaperAuthenticationService(Proxy proxy, String clientToken) {
|
|
+ super(proxy, clientToken);
|
|
+ this.environment = (Environment)EnvironmentParser.getEnvironmentFromProperties().orElse(YggdrasilEnvironment.PROD);;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public UserAuthentication createUserAuthentication(Agent agent) {
|
|
+ return new PaperUserAuthentication(this, agent);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public MinecraftSessionService createMinecraftSessionService() {
|
|
+ return new PaperMinecraftSessionService(this, this.environment);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public GameProfileRepository createProfileRepository() {
|
|
+ return new PaperGameProfileRepository(this, this.environment);
|
|
+ }
|
|
+}
|
|
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
|
|
index 0000000000000000000000000000000000000000..582c169c85ac66f1f9430f79042e4655f776c157
|
|
--- /dev/null
|
|
+++ b/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java
|
|
@@ -0,0 +1,18 @@
|
|
+package com.destroystokyo.paper.profile;
|
|
+
|
|
+import com.mojang.authlib.Agent;
|
|
+import com.mojang.authlib.Environment;
|
|
+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, Environment environment) {
|
|
+ super(authenticationService, environment);
|
|
+ }
|
|
+
|
|
+ @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
|
|
index 0000000000000000000000000000000000000000..93d73c27340645c7502acafdc0b2cfbc1a759dd8
|
|
--- /dev/null
|
|
+++ b/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java
|
|
@@ -0,0 +1,30 @@
|
|
+package com.destroystokyo.paper.profile;
|
|
+
|
|
+import com.mojang.authlib.Environment;
|
|
+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, Environment environment) {
|
|
+ super(authenticationService, environment);
|
|
+ }
|
|
+
|
|
+ @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
|
|
index 0000000000000000000000000000000000000000..3aceb0ea8a1a3ed94dd8a9e954c52ecd341c6bd1
|
|
--- /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);
|
|
+ }
|
|
+}
|
|
diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
|
|
index 17d73ebbe51a83f79f338bdb1b366cecd99f880d..39174bca00b4535e92f6b325b3fd058ceae41f8b 100644
|
|
--- a/src/main/java/net/minecraft/server/MCUtil.java
|
|
+++ b/src/main/java/net/minecraft/server/MCUtil.java
|
|
@@ -1,9 +1,12 @@
|
|
package net.minecraft.server;
|
|
|
|
import com.destroystokyo.paper.block.TargetBlockInfo;
|
|
+import com.destroystokyo.paper.profile.CraftPlayerProfile;
|
|
+import com.destroystokyo.paper.profile.PlayerProfile;
|
|
import com.google.common.util.concurrent.ThreadFactoryBuilder;
|
|
import it.unimi.dsi.fastutil.objects.ObjectRBTreeSet;
|
|
import org.apache.commons.lang.exception.ExceptionUtils;
|
|
+import com.mojang.authlib.GameProfile;
|
|
import org.bukkit.Location;
|
|
import org.bukkit.block.BlockFace;
|
|
import org.bukkit.craftbukkit.CraftWorld;
|
|
@@ -338,6 +341,10 @@ public final class MCUtil {
|
|
return run.get();
|
|
}
|
|
|
|
+ public static PlayerProfile toBukkit(GameProfile profile) {
|
|
+ return CraftPlayerProfile.asBukkitMirror(profile);
|
|
+ }
|
|
+
|
|
/**
|
|
* Calculates distance between 2 entities
|
|
* @param e1
|
|
diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
|
|
index 059b9634aeffc6f710d40112f5f8d9b877f2c7a3..d80235349ea8cc868b720b69f7f0812184e895c8 100644
|
|
--- a/src/main/java/net/minecraft/server/Main.java
|
|
+++ b/src/main/java/net/minecraft/server/Main.java
|
|
@@ -94,7 +94,7 @@ public class Main {
|
|
}
|
|
|
|
File file = (File) optionset.valueOf("universe"); // CraftBukkit
|
|
- 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();
|
|
UserCache usercache = new UserCache(gameprofilerepository, new File(file, MinecraftServer.b.getName()));
|
|
diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java
|
|
index 7171bdf7fb0489e9678588dfa33410984015ea3f..2484293b12d9ec88b8a2570aa853a12f0d858193 100644
|
|
--- a/src/main/java/net/minecraft/server/UserCache.java
|
|
+++ b/src/main/java/net/minecraft/server/UserCache.java
|
|
@@ -42,7 +42,7 @@ public class UserCache {
|
|
|
|
private static final Logger LOGGER = LogManager.getLogger();
|
|
private static boolean b;
|
|
- private final Map<String, UserCache.UserCacheEntry> c = Maps.newConcurrentMap();
|
|
+ private final Map<String, UserCache.UserCacheEntry> c = Maps.newConcurrentMap();private final Map<String, UserCache.UserCacheEntry> nameCache = c; // Paper - OBFHELPER // Paper
|
|
private final Map<UUID, UserCache.UserCacheEntry> d = Maps.newConcurrentMap();
|
|
private final GameProfileRepository e;
|
|
private final Gson f = (new GsonBuilder()).create();
|
|
@@ -106,6 +106,7 @@ public class UserCache {
|
|
return UserCache.b;
|
|
}
|
|
|
|
+ public void saveProfile(GameProfile gameprofile) { a(gameprofile); } // Paper - OBFHELPER
|
|
public synchronized void a(GameProfile gameprofile) { // Paper - synchronize
|
|
Calendar calendar = Calendar.getInstance();
|
|
|
|
@@ -155,6 +156,13 @@ public class UserCache {
|
|
return gameprofile;
|
|
}
|
|
|
|
+ // 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
|
|
public GameProfile getProfile(UUID uuid) {
|
|
UserCache.UserCacheEntry usercache_usercacheentry = (UserCache.UserCacheEntry) this.d.get(uuid);
|
|
@@ -337,7 +345,7 @@ public class UserCache {
|
|
|
|
static class UserCacheEntry {
|
|
|
|
- private final GameProfile a;
|
|
+ private final GameProfile a;public GameProfile getProfile() { return a; } // Paper - OBFHELPER
|
|
private final Date b;
|
|
private volatile long c;
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
index 474bbbbd2adca0e504d351b581f4cb544a8d41e3..6f9efe4e5d286fc73a1ecf82e39865715ff03a33 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
@@ -226,6 +226,9 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
|
|
|
|
import net.md_5.bungee.api.chat.BaseComponent; // Spigot
|
|
|
|
+import javax.annotation.Nullable; // Paper
|
|
+import javax.annotation.Nonnull; // Paper
|
|
+
|
|
public final class CraftServer implements Server {
|
|
private final String serverName = "Paper"; // Paper
|
|
private final String serverVersion;
|
|
@@ -2234,5 +2237,24 @@ public final class CraftServer implements Server {
|
|
public boolean suggestPlayerNamesWhenNullTabCompletions() {
|
|
return com.destroystokyo.paper.PaperConfig.suggestPlayersWhenNullTabCompletions;
|
|
}
|
|
+
|
|
+ @Override
|
|
+ public com.destroystokyo.paper.profile.PlayerProfile createProfile(@Nonnull UUID uuid) {
|
|
+ return createProfile(uuid, null);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public com.destroystokyo.paper.profile.PlayerProfile createProfile(@Nonnull String name) {
|
|
+ return createProfile(null, name);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public com.destroystokyo.paper.profile.PlayerProfile createProfile(@Nullable UUID uuid, @Nullable String name) {
|
|
+ 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);
|
|
+ }
|
|
+ return new com.destroystokyo.paper.profile.CraftPlayerProfile(uuid, name);
|
|
+ }
|
|
// Paper end
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
|
|
index 4fb27cc7ed062696239f75b6f85ddb0a31866568..c31011ff91f4ea8368e3afbc5ec07eff84e93fe2 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
|
|
@@ -71,6 +71,13 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
|
|
}
|
|
|
|
private void setProfile(GameProfile profile) {
|
|
+ // Paper start
|
|
+ if (profile != null) {
|
|
+ com.destroystokyo.paper.profile.CraftPlayerProfile paperProfile = new com.destroystokyo.paper.profile.CraftPlayerProfile(profile);
|
|
+ paperProfile.completeFromCache(false, true);
|
|
+ profile = paperProfile.getGameProfile();
|
|
+ }
|
|
+ // Paper end
|
|
this.profile = profile;
|
|
this.serializedProfile = (profile == null) ? null : GameProfileSerializer.serialize(new NBTTagCompound(), profile);
|
|
}
|