Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-03 01:10:37 +01:00
Code Issues Projects Releases Wiki Activity
b0d78d461b
Paper/Spigot-Server-Patches/0150-Add-setting-for-proxy-online-mode-status.patch

52 lines
2.7 KiB
Diff
Raw Normal View History

Update upstream B/CB/S
2017-05-05 01:08:52 +02:00
From c6c96c233b11b2ad11e28e3a11f8a3f7be84440e Mon Sep 17 00:00:00 2001
Introduce a setting to handle offline proxies Servers behind a bungeecord proxy in offline mode will now properly pull offline mode UUIDs and data when this setting is set to false. Default is unchanged.
2016-08-13 01:08:53 +02:00
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
Update upstream B/CB/S
2017-05-05 01:08:52 +02:00
index 0140d1981..c758bde3f 100644
Introduce a setting to handle offline proxies Servers behind a bungeecord proxy in offline mode will now properly pull offline mode UUIDs and data when this setting is set to false. Default is unchanged.
2016-08-13 01:08:53 +02:00
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
Update upstream B/CB/S
2017-05-05 01:08:52 +02:00
@@ -230,4 +230,9 @@ public class PaperConfig {
Introduce a setting to handle offline proxies Servers behind a bungeecord proxy in offline mode will now properly pull offline mode UUIDs and data when this setting is set to false. Default is unchanged.
2016-08-13 01:08:53 +02: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);
+ }
}
diff --git a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
Update upstream B/CB/S Adds /paper command for reloading the paper config. Closes GH-639 Per-world config logging has been removed in favor of all or nothing logging for all paper settings. I don't believe it was used enough to warrant maintaining. If this is not the case it should be possible to re-add it.
2017-03-25 04:18:58 +01:00
index 2ff8a6da0..52e736080 100644
Introduce a setting to handle offline proxies Servers behind a bungeecord proxy in offline mode will now properly pull offline mode UUIDs and data when this setting is set to false. Default is unchanged.
2016-08-13 01:08:53 +02:00
--- 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
Update bStats implementation
2017-04-22 08:16:45 +02:00
index a958ce998..8ade16865 100644
Introduce a setting to handle offline proxies Servers behind a bungeecord proxy in offline mode will now properly pull offline mode UUIDs and data when this setting is set to false. Default is unchanged.
2016-08-13 01:08:53 +02:00
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
Compromise on warning of excessive velocity sets We have long been receiving feedback about our warning messages when excessive velocities are set on entities. We have, for the most part, ignored much of this feedback because these warnings can be vital in identifying the cause of a watchdog crash. These crashes would otherwise be more difficult to identify without this information. However, in many cases these warnings are unnecessarily verbose as the server handles these excessive sets itself without user intervention. As a compromise, we will only warn the user as part of a watchdog crash log, and we will only include the most recent occurrence. This commit represents a first effort on this front. It may need to be tweaked later to provide more relevant information, such as the time it occurred, and/or not printing the warning at all if the occurrence was a certain time period ago.
2017-01-08 23:43:08 +01:00
@@ -1336,7 +1336,8 @@ public final class CraftServer implements Server {
Introduce a setting to handle offline proxies Servers behind a bungeecord proxy in offline mode will now properly pull offline mode UUIDs and data when this setting is set to false. Default is unchanged.
2016-08-13 01:08:53 +02:00
// 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 );
}
--
Update upstream B/CB/S
2017-05-05 01:08:52 +02:00
2.12.2
Introduce a setting to handle offline proxies Servers behind a bungeecord proxy in offline mode will now properly pull offline mode UUIDs and data when this setting is set to false. Default is unchanged.
2016-08-13 01:08:53 +02:00
Reference in New Issue Copy Permalink