2021-06-11 12:02:28 +00: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 15:52:05 +00:00
|
|
|
TODO: Add isProxyOnlineMode check to Metrics
|
2021-06-11 12:02:28 +00:00
|
|
|
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
2022-06-03 04:26:56 +00:00
|
|
|
index 46ec9016e17805664531a61a75fc046e041b0848..01b1eb60894a79bd10a035404cc796ce0d3725c8 100644
|
2021-06-11 12:02:28 +00:00
|
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
|
|
|
@@ -23,6 +23,7 @@ import org.bukkit.configuration.InvalidConfigurationException;
|
|
|
|
import org.bukkit.configuration.file.YamlConfiguration;
|
|
|
|
import co.aikar.timings.Timings;
|
|
|
|
import co.aikar.timings.TimingsManager;
|
|
|
|
+import org.spigotmc.SpigotConfig;
|
|
|
|
|
|
|
|
public class PaperConfig {
|
|
|
|
|
2021-11-09 07:59:15 +00:00
|
|
|
@@ -254,4 +255,13 @@ public class PaperConfig {
|
2021-06-11 12:02:28 +00:00
|
|
|
private static void saveEmptyScoreboardTeams() {
|
|
|
|
saveEmptyScoreboardTeams = getBoolean("settings.save-empty-scoreboard-teams", false);
|
|
|
|
}
|
|
|
|
+
|
|
|
|
+ public static boolean bungeeOnlineMode = true;
|
|
|
|
+ private static void bungeeOnlineMode() {
|
|
|
|
+ bungeeOnlineMode = getBoolean("settings.bungee-online-mode", true);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public static boolean isProxyOnlineMode() {
|
|
|
|
+ return Bukkit.getOnlineMode() || (SpigotConfig.bungee && bungeeOnlineMode);
|
|
|
|
+ }
|
|
|
|
}
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/players/GameProfileCache.java b/src/main/java/net/minecraft/server/players/GameProfileCache.java
|
2022-06-07 19:55:39 +00:00
|
|
|
index 87b7a669ef111b2dc40d152fe6fe4e75ff8ccc98..6087fff889458dc09d5a3eb52e7d4b0a77bde809 100644
|
2021-06-11 12:02:28 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/players/GameProfileCache.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/players/GameProfileCache.java
|
2021-07-07 06:52:40 +00:00
|
|
|
@@ -98,6 +98,7 @@ public class GameProfileCache {
|
2021-06-11 12:02:28 +00:00
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
+ if (com.destroystokyo.paper.PaperConfig.isProxyOnlineMode()) // Paper - only run in online mode - 100 COL
|
|
|
|
repository.findProfilesByNames(new String[]{name}, Agent.MINECRAFT, profilelookupcallback);
|
|
|
|
GameProfile gameprofile = (GameProfile) atomicreference.get();
|
|
|
|
|
2021-07-07 06:52:40 +00:00
|
|
|
@@ -115,7 +116,7 @@ public class GameProfileCache {
|
2021-06-11 12:02:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
private static boolean usesAuthentication() {
|
|
|
|
- return GameProfileCache.usesAuthentication;
|
|
|
|
+ return com.destroystokyo.paper.PaperConfig.isProxyOnlineMode(); // Paper
|
|
|
|
}
|
|
|
|
|
2022-03-18 03:53:36 +00:00
|
|
|
public void add(GameProfile profile) {
|
2021-06-11 12:02:28 +00: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-07 19:55:39 +00:00
|
|
|
index da98f074ccd5a40c635824112c97fd174c393cb1..fd9c7e4cb637b67fbbcbee6f8e2449c4e62fc344 100644
|
2021-06-11 12:02:28 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/players/OldUsersConverter.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/players/OldUsersConverter.java
|
2021-07-07 06:52:40 +00:00
|
|
|
@@ -66,7 +66,8 @@ public class OldUsersConverter {
|
2021-06-11 12:02:28 +00:00
|
|
|
return new String[i];
|
|
|
|
});
|
|
|
|
|
|
|
|
- if (server.usesAuthentication() || org.spigotmc.SpigotConfig.bungee) { // Spigot: bungee = online mode, for now.
|
|
|
|
+ if (server.usesAuthentication()
|
|
|
|
+ || (com.destroystokyo.paper.PaperConfig.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
|
2022-06-07 19:55:39 +00:00
|
|
|
index f40446e07308dd9f09622dba55933bc3486f80b8..abada046fd469cc5c423c26571d70b5ea062eda1 100644
|
2021-06-11 12:02:28 +00:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
2022-06-07 19:55:39 +00:00
|
|
|
@@ -1686,7 +1686,7 @@ public final class CraftServer implements Server {
|
2021-06-11 12:02:28 +00:00
|
|
|
// Spigot Start
|
|
|
|
GameProfile profile = null;
|
|
|
|
// Only fetch an online UUID in online mode
|
2021-06-12 06:02:49 +00:00
|
|
|
- if ( this.getOnlineMode() || org.spigotmc.SpigotConfig.bungee )
|
|
|
|
+ if ( this.getOnlineMode() || com.destroystokyo.paper.PaperConfig.isProxyOnlineMode() ) // Paper - Handle via setting
|
2021-06-11 12:02:28 +00:00
|
|
|
{
|
2021-07-07 06:52:40 +00:00
|
|
|
profile = this.console.getProfileCache().get(name).orElse(null);
|
2021-06-11 12:02:28 +00:00
|
|
|
}
|