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

52 lines
2.7 KiB
Diff
Raw Normal View History

NOT FINISHED! even more 1.13-pre patches!
2018-07-16 20:08:09 +00:00
From eb105e6e240bc10506a92fc0972efbbf8912ee05 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
Optimize Hoppers - Lots of itemstack cloning removed. Only clone if the item is actually moved - Return true when a plugin cancels inventory move item event instead of false, as false causes pulls to cycle through all items. However, pushes do not exhibit the same behavior, so this is not something plugins could of been relying on. - Add option (Default on) to cooldown hoppers when they fail to move an item due to full inventory - Skip subsequent InventoryMoveItemEvents if a plugin does not use the item after first event fire for an iteration
2018-01-18 06:00:51 +00:00
index 011cbf5e3..cf06f8ac3 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
Update upstream B/CB/S
2017-05-04 23:08:52 +00: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-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
NOT FINISHED! even more 1.13-pre patches!
2018-07-16 20:08:09 +00:00
index f13534917..85c7a96c5 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
NOT FINISHED! even more 1.13-pre patches!
2018-07-16 20:08:09 +00:00
@@ -60,7 +60,8 @@ public class NameReferencingFileConverter {
return new String[i];
});
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
- 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
NOT FINISHED! even more 1.13-pre patches!
2018-07-16 20:08:09 +00:00
index 2bcd1c3ca..a36192362 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
NOT FINISHED! even more 1.13-pre patches!
2018-07-16 20:08:09 +00:00
@@ -1374,7 +1374,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 );
}
--
Current Chunk for Entity and Block Entities, counts by entity type This enables us a fast reference to the entities current chunk instead of having to look it up by hashmap lookups. We also store counts by type to further enable other performance optimizations in later patches.
2018-07-04 07:55:24 +00:00
2.18.0
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