Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-15 11:00:06 +01:00
459987d69f
improved the water code so that immunity wont trigger if the entity has the water pathfinder system active, so this improves support for all entities that know how to behave in water. Merged 2 EAR patches together, and removed an MCUtil method that doesnt have a purpose anymore
528 Zeilen
20 KiB
Diff
528 Zeilen
20 KiB
Diff
From 84e2ca2bf186beba6ac2aaf2c2546cf2a0def6d6 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 0000000000..b151a13c1b
|
|
--- /dev/null
|
|
+++ b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java
|
|
@@ -0,0 +1,280 @@
|
|
+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.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) {
|
|
+ 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() {
|
|
+ return completeFromCache(false);
|
|
+ }
|
|
+
|
|
+ public boolean completeFromCache(boolean lookupName) {
|
|
+ if (profile.isComplete()) {
|
|
+ return true;
|
|
+ }
|
|
+ MinecraftServer server = MinecraftServer.getServer();
|
|
+ String name = profile.getName();
|
|
+ UserCache userCache = server.getUserCache();
|
|
+ if (profile.getId() == null) {
|
|
+ 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);
|
|
+ }
|
|
+ if (profile != null) {
|
|
+ this.profile = profile;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ if (profile.getName() == null) {
|
|
+ // If we need textures, skip this check, as we will get it below anyways.
|
|
+ GameProfile profile = userCache.getProfile(this.profile.getId());
|
|
+ if (profile != null) {
|
|
+ this.profile = profile;
|
|
+ }
|
|
+ }
|
|
+ return this.profile.isComplete();
|
|
+ }
|
|
+
|
|
+ public boolean complete(boolean textures) {
|
|
+ MinecraftServer server = MinecraftServer.getServer();
|
|
+
|
|
+ boolean isOnlineMode = server.getOnlineMode() || (SpigotConfig.bungee && PaperConfig.bungeeOnlineMode);
|
|
+ boolean isCompleteFromCache = this.completeFromCache(true);
|
|
+ if (isOnlineMode && (!isCompleteFromCache || textures && !hasTextures())) {
|
|
+ GameProfile result = server.getSessionService().fillProfileProperties(profile, true);
|
|
+ if (result != null) {
|
|
+ this.profile = result;
|
|
+ }
|
|
+ }
|
|
+ return profile.isComplete() && (!isOnlineMode || !textures || hasTextures());
|
|
+ }
|
|
+
|
|
+ private static void copyProfileProperties(GameProfile source, GameProfile target) {
|
|
+ PropertyMap sourceProperties = source.getProperties();
|
|
+ if (sourceProperties.isEmpty()) {
|
|
+ return;
|
|
+ }
|
|
+ PropertyMap properties = target.getProperties();
|
|
+ properties.clear();
|
|
+
|
|
+ for (Property property : sourceProperties.values()) {
|
|
+ properties.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 0000000000..25836b975b
|
|
--- /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
|
|
index 0000000000..3bcdb8f93f
|
|
--- /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
|
|
index 0000000000..4b2a67423f
|
|
--- /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
|
|
index 0000000000..3aceb0ea8a
|
|
--- /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 e1af5c4885..0ef5ad1165 100644
|
|
--- a/src/main/java/net/minecraft/server/MCUtil.java
|
|
+++ b/src/main/java/net/minecraft/server/MCUtil.java
|
|
@@ -1,7 +1,10 @@
|
|
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 com.mojang.authlib.GameProfile;
|
|
import org.apache.commons.lang.exception.ExceptionUtils;
|
|
import org.bukkit.Location;
|
|
import org.bukkit.block.BlockFace;
|
|
@@ -158,6 +161,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/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
index 6a3d5fdff4..65204c259e 100644
|
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
@@ -1189,7 +1189,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
|
|
*/ // CraftBukkit end
|
|
|
|
String s1 = "."; // PAIL?
|
|
- 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(s1, MinecraftServer.a.getName()));
|
|
@@ -1638,6 +1638,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
|
|
this.G = i;
|
|
}
|
|
|
|
+ public MinecraftSessionService getSessionService() { return ap(); } // Paper - OBFHELPER
|
|
public MinecraftSessionService ap() {
|
|
return this.V;
|
|
}
|
|
diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java
|
|
index a47a51a412..4c476f757c 100644
|
|
--- a/src/main/java/net/minecraft/server/UserCache.java
|
|
+++ b/src/main/java/net/minecraft/server/UserCache.java
|
|
@@ -44,7 +44,7 @@ public class UserCache {
|
|
|
|
public static final SimpleDateFormat a = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z");
|
|
private static boolean c;
|
|
- private final Map<String, UserCache.UserCacheEntry> d = Maps.newHashMap();
|
|
+ private final Map<String, UserCache.UserCacheEntry> d = Maps.newHashMap();private final Map<String, UserCache.UserCacheEntry> nameCache = d; // Paper - OBFHELPER
|
|
private final Map<UUID, UserCache.UserCacheEntry> e = Maps.newHashMap();
|
|
private final Deque<GameProfile> f = new java.util.concurrent.LinkedBlockingDeque<GameProfile>(); // CraftBukkit
|
|
private final GameProfileRepository g;
|
|
@@ -166,6 +166,13 @@ public class UserCache {
|
|
return usercache_usercacheentry == null ? null : usercache_usercacheentry.a();
|
|
}
|
|
|
|
+ // 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) { return a(uuid); } // Paper - OBFHELPER
|
|
@Nullable
|
|
public synchronized GameProfile a(UUID uuid) { // Paper - synchronize
|
|
@@ -275,7 +282,7 @@ public class UserCache {
|
|
|
|
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) {
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
index cabe0a7451..74e466d1f6 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
@@ -159,6 +159,10 @@ import org.bukkit.event.server.ServerLoadEvent;
|
|
import org.bukkit.event.server.TabCompleteEvent;
|
|
import net.md_5.bungee.api.chat.BaseComponent;
|
|
|
|
+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;
|
|
@@ -2067,5 +2071,21 @@ public final class CraftServer implements Server {
|
|
public boolean suggestPlayerNamesWhenNullTabCompletions() {
|
|
return com.destroystokyo.paper.PaperConfig.suggestPlayersWhenNullTabCompletions;
|
|
}
|
|
+
|
|
+ public com.destroystokyo.paper.profile.PlayerProfile createProfile(@Nonnull UUID uuid) {
|
|
+ return createProfile(uuid, null);
|
|
+ }
|
|
+
|
|
+ public com.destroystokyo.paper.profile.PlayerProfile createProfile(@Nonnull String name) {
|
|
+ return createProfile(null, name);
|
|
+ }
|
|
+
|
|
+ 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
|
|
}
|
|
--
|
|
2.19.0
|
|
|