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
2024-01-14 16:31:39 +01:00
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
2024-01-24 13:07:40 +01:00
index 726bb3fcb25321d80caa5967cca86733a234b939..1e73010b292b4d46daaa33ea5b9480bf00944390 100644
2024-01-14 16:31:39 +01:00
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
2024-01-24 13:07:40 +01:00
@@ -557,7 +557,11 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
2024-01-14 16:31:39 +01:00
public boolean enforceSecureProfile() {
DedicatedServerProperties dedicatedserverproperties = this.getProperties();
- return dedicatedserverproperties.enforceSecureProfile && dedicatedserverproperties.onlineMode && this.services.canValidateProfileKeys();
+ // Paper start - Add setting for proxy online mode status
+ return dedicatedserverproperties.enforceSecureProfile
+ && io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode()
+ && this.services.canValidateProfileKeys();
+ // Paper end - Add setting for proxy online mode status
}
@Override
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
2024-01-23 15:43:48 +01:00
index 3c9c6a697143c7e980add58576ad288b8f51ae35..92c22dc10e385f1942f2ec375bbce9faf257462b 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
2023-12-28 21:47:57 +01:00
@@ -89,7 +89,8 @@ public class GameProfileCache {
2023-12-05 22:34:01 +01:00
}
};
2021-06-11 14:02:28 +02:00
2024-01-15 12:38:39 +01:00
- if (!org.apache.commons.lang3.StringUtils.isBlank(name)) // Paper - Don't lookup a profile with a blank name
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
2024-01-14 16:31:39 +01:00
+ && io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode()) // Paper - Add setting for proxy online mode status
2023-12-05 22:34:01 +01:00
repository.findProfilesByNames(new String[]{name}, profilelookupcallback);
GameProfile gameprofile = (GameProfile) atomicreference.get();
2021-06-11 14:02:28 +02:00
2023-12-28 21:47:57 +01:00
@@ -106,7 +107,7 @@ public class GameProfileCache {
2021-06-11 14:02:28 +02:00
}
private static boolean usesAuthentication() {
- return GameProfileCache.usesAuthentication;
2024-01-14 16:31:39 +01:00
+ return io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode(); // Paper - Add setting for proxy online mode status
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
2024-01-23 15:43:48 +01:00
index b3c6e76105ee26a79a84a203935530f859460652..e697b8f7b165d2394d8155cbee7453e23ac2bee4 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
2023-12-05 22:34:01 +01: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.
2023-09-21 22:35:39 +02:00
+ if (server.usesAuthentication() ||
2024-01-14 16:31:39 +01:00
+ (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode())) { // Spigot: bungee = online mode, for now. // Paper - Add setting for proxy online mode status
2023-09-21 22:35:39 +02:00
server.getProfileRepository().findProfilesByNames(astring, callback);
2021-06-11 14:02:28 +02:00
} else {
String[] astring1 = astring;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
2024-01-24 22:13:08 +01:00
index fb6c21a43e771317526972c183d95402d941924b..040d5fa985f746d90e144b668ebb2adb79c33daa 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
2024-01-14 10:46:04 +01:00
@@ -1821,7 +1821,7 @@ public final class CraftServer implements Server {
if (result == null) {
2021-06-11 14:02:28 +02:00
GameProfile profile = null;
// Only fetch an online UUID in online mode
2024-01-14 10:46:04 +01:00
- if (this.getOnlineMode() || org.spigotmc.SpigotConfig.bungee) { // Spigot: bungee = online mode, for now.
2024-01-14 16:31:39 +01:00
+ if (this.getOnlineMode() || io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode()) { // Paper - Add setting for proxy online mode status
2024-01-14 10:46:04 +01:00
// This is potentially blocking :(
2021-07-07 08:52:40 +02:00
profile = this.console.getProfileCache().get(name).orElse(null);
2021-06-11 14:02:28 +02:00
}