core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
testserver/Spigot-Server-Patches/0152-Add-setting-for-proxy-...

52 lines
2.7 KiB
Diff
Raw Normal View History

Update upstream B/CB/S
2017-01-20 11:21:44 +00:00
From 5a14f84b25e0316aaac5ca28325a20ad965a41b1 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-12 23:08:53 +00: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 Closes GH-569
2017-01-06 21:45:59 +00:00
index 5c9ea0f..b1aa228 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-12 23:08:53 +00:00
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
Add rate limiting to PacketPlayInUseItem as well Also removes our toggle for Spigot's option, I doubt anyone uses it.
2016-09-11 02:42:47 +00:00
@@ -220,4 +220,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-12 23:08:53 +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);
+ }
}
diff --git a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
Update Paper to MC 1.11
2016-11-17 02:23:38 +00:00
index 2ff8a6d..52e7360 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-12 23:08:53 +00: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
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 22:43:08 +00:00
index 8cb8cbe..1bbce7a 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-12 23:08:53 +00: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 22:43:08 +00: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-12 23:08:53 +00: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 CB
2016-12-10 23:50:31 +00:00
2.9.3
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-12 23:08:53 +00:00