From 21d91ce634481f58a8e94f6c02651dbaaeb4408f Mon Sep 17 00:00:00 2001 From: Bridge <29434554+bridgelol@users.noreply.github.com> Date: Sun, 5 May 2024 19:07:30 +0200 Subject: Prevent profile lookups when unnecessary (#10651) --- patches/server/0140-Basic-PlayerProfile-API.patch | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/patches/server/0140-Basic-PlayerProfile-API.patch b/patches/server/0140-Basic-PlayerProfile-API.patch index 81c8e55127..54a4ffa62b 100644 --- a/patches/server/0140-Basic-PlayerProfile-API.patch +++ b/patches/server/0140-Basic-PlayerProfile-API.patch @@ -16,10 +16,10 @@ public org.bukkit.craftbukkit.profile.CraftPlayerProfile setProperty(Ljava/lang/ 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..68c99e29450e318d2b6eb83099e3e4012b6f0c01 +index 0000000000000000000000000000000000000000..a750ec2cde2c6b3942806241b2d972cef57f3d44 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java -@@ -0,0 +1,412 @@ +@@ -0,0 +1,416 @@ +package com.destroystokyo.paper.profile; + +import com.mojang.authlib.yggdrasil.ProfileResult; @@ -248,9 +248,13 @@ index 0000000000000000000000000000000000000000..68c99e29450e318d2b6eb83099e3e401 + return complete(textures, GlobalConfiguration.get().proxies.isProxyOnlineMode()); + } + public boolean complete(boolean textures, boolean onlineMode) { ++ if (this.isComplete() && (!textures || hasTextures())) { // Don't do lookup if we already have everything ++ return true; ++ } ++ + MinecraftServer server = MinecraftServer.getServer(); + boolean isCompleteFromCache = this.completeFromCache(true, onlineMode); -+ if (onlineMode && (!isCompleteFromCache || textures && !hasTextures())) { ++ if (onlineMode && (!isCompleteFromCache || (textures && !hasTextures()))) { + ProfileResult result = server.getSessionService().fetchProfile(this.getId(), true); + if (result != null && result.profile() != null) { + copyProfileProperties(result.profile(), this.profile, true); -- cgit v1.2.3