52 lines
2.7 KiB
Diff
52 lines
2.7 KiB
Diff
|
From 29786a2502ed0a436d942081543cdc21bc090214 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
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||
|
|
index 058720f..ab4e305 100644
|
||
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||
|
|
@@ -228,4 +228,9 @@ public class PaperConfig {
|
||
|
|
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);
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
|
||
|
|
index e21a8c4..41f6300 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
|
||
|
|
@@ -65,7 +65,8 @@ public class NameReferencingFileConverter {
|
||
|
|
}
|
||
|
|
}), String.class);
|
||
|
|
|
||
|
|
- if (minecraftserver.getOnlineMode() || org.spigotmc.SpigotConfig.bungee) { // Spigot: bungee = online mode, for now.
|
||
|
|
+ if (minecraftserver.getOnlineMode()
|
||
|
|
+ || (org.spigotmc.SpigotConfig.bungee && com.destroystokyo.paper.PaperConfig.bungeeOnlineMode)) { // Spigot: bungee = online mode, for now. // Paper - Handle via setting
|
||
|
|
minecraftserver.getGameProfileRepository().findProfilesByNames(astring, Agent.MINECRAFT, profilelookupcallback);
|
||
|
|
} 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 62a598c..0042cc5 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||
|
|
@@ -1343,7 +1343,8 @@ public final class CraftServer implements Server {
|
||
|
|
// Spigot Start
|
||
|
|
GameProfile profile = null;
|
||
|
|
// Only fetch an online UUID in online mode
|
||
|
|
- if ( MinecraftServer.getServer().getOnlineMode() || org.spigotmc.SpigotConfig.bungee )
|
||
|
|
+ if ( MinecraftServer.getServer().getOnlineMode()
|
||
|
|
+ || (org.spigotmc.SpigotConfig.bungee && com.destroystokyo.paper.PaperConfig.bungeeOnlineMode)) // Paper - Handle via setting
|
||
|
|
{
|
||
|
|
profile = console.getUserCache().getProfile( name );
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.9.2.windows.1
|
||
|
|
|