2021-06-11 14:02:28 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Gabriele C <sgdc3.mail@gmail.com>
|
|
|
|
Date: Fri, 5 Aug 2016 01:03:08 +0200
|
|
|
|
Subject: [PATCH] Add setting for proxy online mode status
|
|
|
|
|
2021-06-11 17:52:05 +02:00
|
|
|
TODO: Add isProxyOnlineMode check to Metrics
|
2021-06-11 14:02:28 +02:00
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/players/GameProfileCache.java b/src/main/java/net/minecraft/server/players/GameProfileCache.java
|
2022-12-07 17:46:46 +01:00
|
|
|
index 5288aec173549a982e42aeeccf7f5f394080955d..58e923f4ef1980bc7fff1e3b3fcdaad8c4eded53 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/players/GameProfileCache.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/players/GameProfileCache.java
|
2022-06-09 23:37:26 +02:00
|
|
|
@@ -98,7 +98,8 @@ public class GameProfileCache {
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2022-06-09 23:37:26 +02:00
|
|
|
- if (!org.apache.commons.lang3.StringUtils.isBlank(name)) // Paper - Don't lookup a profile with a blank name)
|
|
|
|
+ if (!org.apache.commons.lang3.StringUtils.isBlank(name) // Paper - Don't lookup a profile with a blank name
|
|
|
|
+ && io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode()) // Paper - only run in online mode - 100 COL
|
2021-06-11 14:02:28 +02:00
|
|
|
repository.findProfilesByNames(new String[]{name}, Agent.MINECRAFT, profilelookupcallback);
|
|
|
|
GameProfile gameprofile = (GameProfile) atomicreference.get();
|
|
|
|
|
2022-06-09 23:37:26 +02:00
|
|
|
@@ -116,7 +117,7 @@ public class GameProfileCache {
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
private static boolean usesAuthentication() {
|
|
|
|
- return GameProfileCache.usesAuthentication;
|
2022-06-09 10:51:45 +02:00
|
|
|
+ return io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode(); // Paper
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
|
2022-03-18 04:53:36 +01:00
|
|
|
public void add(GameProfile profile) {
|
2021-06-11 14:02:28 +02:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/players/OldUsersConverter.java b/src/main/java/net/minecraft/server/players/OldUsersConverter.java
|
2022-06-09 10:51:45 +02:00
|
|
|
index da98f074ccd5a40c635824112c97fd174c393cb1..6599f874d9f97e9ef4862039ecad7277bbc5fd91 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/players/OldUsersConverter.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/players/OldUsersConverter.java
|
2021-07-07 08:52:40 +02:00
|
|
|
@@ -66,7 +66,8 @@ public class OldUsersConverter {
|
2021-06-11 14:02:28 +02:00
|
|
|
return new String[i];
|
|
|
|
});
|
|
|
|
|
|
|
|
- if (server.usesAuthentication() || org.spigotmc.SpigotConfig.bungee) { // Spigot: bungee = online mode, for now.
|
|
|
|
+ if (server.usesAuthentication()
|
2022-06-09 10:51:45 +02:00
|
|
|
+ || (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode())) { // Spigot: bungee = online mode, for now. // Paper - Handle via setting
|
2021-06-11 14:02:28 +02:00
|
|
|
server.getProfileRepository().findProfilesByNames(astring, Agent.MINECRAFT, callback);
|
|
|
|
} else {
|
|
|
|
String[] astring1 = astring;
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
2023-06-13 01:51:45 +02:00
|
|
|
index 83119de3ae3e38ba4bb77abf005043cfa82c4670..a392be8dee7eccc5f6a55edf02ec207bcb65b0a5 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
2023-06-13 01:51:45 +02:00
|
|
|
@@ -1740,7 +1740,7 @@ public final class CraftServer implements Server {
|
2021-06-11 14:02:28 +02:00
|
|
|
// Spigot Start
|
|
|
|
GameProfile profile = null;
|
|
|
|
// Only fetch an online UUID in online mode
|
2021-06-12 08:02:49 +02:00
|
|
|
- if ( this.getOnlineMode() || org.spigotmc.SpigotConfig.bungee )
|
2022-06-09 10:51:45 +02:00
|
|
|
+ if ( this.getOnlineMode() || io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode() ) // Paper - Handle via setting
|
2021-06-11 14:02:28 +02:00
|
|
|
{
|
2021-07-07 08:52:40 +02:00
|
|
|
profile = this.console.getProfileCache().get(name).orElse(null);
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|