aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0105-Add-setting-for-proxy-online-mode-status.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0105-Add-setting-for-proxy-online-mode-status.patch')
-rw-r--r--patches/server/0105-Add-setting-for-proxy-online-mode-status.patch57
1 files changed, 57 insertions, 0 deletions
diff --git a/patches/server/0105-Add-setting-for-proxy-online-mode-status.patch b/patches/server/0105-Add-setting-for-proxy-online-mode-status.patch
new file mode 100644
index 0000000000..bd273b8189
--- /dev/null
+++ b/patches/server/0105-Add-setting-for-proxy-online-mode-status.patch
@@ -0,0 +1,57 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Gabriele C <[email protected]>
+Date: Fri, 5 Aug 2016 01:03:08 +0200
+Subject: [PATCH] Add setting for proxy online mode status
+
+TODO: Add isProxyOnlineMode check to Metrics
+
+diff --git a/src/main/java/net/minecraft/server/players/GameProfileCache.java b/src/main/java/net/minecraft/server/players/GameProfileCache.java
+index 3295fd4bca58cf8feeff2fcefa514a5ec89310f9..376845f5a25a348e76193fac5c047b0ba2fb080f 100644
+--- a/src/main/java/net/minecraft/server/players/GameProfileCache.java
++++ b/src/main/java/net/minecraft/server/players/GameProfileCache.java
+@@ -98,7 +98,8 @@ public class GameProfileCache {
+ }
+ };
+
+- 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
+ repository.findProfilesByNames(new String[]{name}, Agent.MINECRAFT, profilelookupcallback);
+ GameProfile gameprofile = (GameProfile) atomicreference.get();
+
+@@ -116,7 +117,7 @@ public class GameProfileCache {
+ }
+
+ private static boolean usesAuthentication() {
+- return GameProfileCache.usesAuthentication;
++ return io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode(); // Paper
+ }
+
+ public void add(GameProfile profile) {
+diff --git a/src/main/java/net/minecraft/server/players/OldUsersConverter.java b/src/main/java/net/minecraft/server/players/OldUsersConverter.java
+index da98f074ccd5a40c635824112c97fd174c393cb1..6599f874d9f97e9ef4862039ecad7277bbc5fd91 100644
+--- a/src/main/java/net/minecraft/server/players/OldUsersConverter.java
++++ b/src/main/java/net/minecraft/server/players/OldUsersConverter.java
+@@ -66,7 +66,8 @@ public class OldUsersConverter {
+ return new String[i];
+ });
+
+- if (server.usesAuthentication() || org.spigotmc.SpigotConfig.bungee) { // Spigot: bungee = online mode, for now.
++ if (server.usesAuthentication()
++ || (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode())) { // Spigot: bungee = online mode, for now. // Paper - Handle via setting
+ 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
+index 943971ce16c0c39085f029ab5b57685dda1c6b0f..0d6dcb670c583f47a299cd96574426932d3b98c8 100644
+--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
++++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+@@ -1706,7 +1706,7 @@ public final class CraftServer implements Server {
+ // Spigot Start
+ GameProfile profile = null;
+ // Only fetch an online UUID in online mode
+- if ( this.getOnlineMode() || org.spigotmc.SpigotConfig.bungee )
++ if ( this.getOnlineMode() || io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode() ) // Paper - Handle via setting
+ {
+ profile = this.console.getProfileCache().get(name).orElse(null);
+ }