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

64 lines
3.1 KiB
Diff
Raw Normal View History

Initial work on 1.14 pre-5
2019-04-23 04:47:07 +00:00
From 2dc12219463415aebdee8014771aeced2951e9ef 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
Initial work on 1.14 pre-5
2019-04-23 04:47:07 +00:00
index c6d2c30339..b7b28591e4 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 Velocity IP forwarding support (#1557) While Velocity supports BungeeCord-style IP forwarding, it is not secure. Users have a lot of problems setting up firewalls or setting up plugins like IPWhitelist. Further, the BungeeCord IP forwarding protocol still retains essentially its original form, when there is brand new support for custom login plugin messages in 1.13. Velocity's modern IP forwarding uses an HMAC-SHA256 code to ensure authenticity of messages, is packed into a binary format that is smaller than BungeeCord's forwarding, and is integrated into the Minecraft login process by using the 1.13 login plugin message packet.
2018-10-19 00:44:59 +00:00
@@ -22,6 +22,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 {
@@ -243,4 +244,13 @@ 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);
Add Velocity IP forwarding support (#1557) While Velocity supports BungeeCord-style IP forwarding, it is not secure. Users have a lot of problems setting up firewalls or setting up plugins like IPWhitelist. Further, the BungeeCord IP forwarding protocol still retains essentially its original form, when there is brand new support for custom login plugin messages in 1.13. Velocity's modern IP forwarding uses an HMAC-SHA256 code to ensure authenticity of messages, is packed into a binary format that is smaller than BungeeCord's forwarding, and is integrated into the Minecraft login process by using the 1.13 login plugin message packet.
2018-10-19 00:44:59 +00:00
+ }
+
+ public static boolean isProxyOnlineMode() {
+ return Bukkit.getOnlineMode() || (SpigotConfig.bungee && bungeeOnlineMode);
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
+ }
}
diff --git a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java
Initial work on 1.14 pre-5
2019-04-23 04:47:07 +00:00
index bf67dbf54a..dcaba3c401 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
Updated Upstream (Bukkit/CraftBukkit/Spigot) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Warning: this commit contains more mapping changes from upstream, As always, ensure that you have working backups and test this build before deployment; Developers working on paper will, yet again, need to delete their work/Minecraft/1.13.2 folder Bukkit Changes: 7fca5fd4 SPIGOT-4558: Preserve user order in the face of copied defaults in configurations 15c9b1eb Ignore spurious slot IDs sent by client, e.g. in enchanting tables 5d2a10c5 SPIGOT-3747: Add API for force loaded chunks d6dd2bb3 SPIGOT-3538: Add getHitBlockFace for ProjectileHitEvent 771db4aa SPIGOT-794: Call EntityPlaceEvent for Minecart placement 55462509 Add InventoryView#getSlotType 2f3ce5b6 Remove EntityTransformEvent and CustomItemTagContainer from draft API f04ad7b6 Make ProjectileLaunchEvent extend EntitySpawnEvent ccb85808 Define EntitySpawnEvent b8cc3ebe Add PlayerItemDamageEvent 184a495d Ease ClassLoader Deadlocks Where Possible 11ac4728 Expand Boolean Prompt Values in Conversation API aae62d51 Added getAllSessionData() to the Conversation API. 9290ff91 Add InventoryView#getInventory API 995e530f Add API to get / set base arrow damage CraftBukkit Changes: c4a67eed SPIGOT-4556: Fix plugins closing inventory during drop events 5be2ddcb Replace version constants with methods to prevent compiler inlining a5b9c7b3 Use API method to create offset command completions 2bc7d1df SPIGOT-3747: Add API for force loaded chunks a408f375 SPIGOT-3538: Add getHitBlockFace for ProjectileHitEvent b54b9409 SPIGOT-2864: Make Arrow / Item setTicksLived behave like FallingBlock 79ded7a8 SPIGOT-1811: Death message not shown on respawn screen b4a4f15d SPIGOT-943: InventoryCloseEvent called on death regardless of open inventory 0afed592 SPIGOT-794: Call EntityPlaceEvent for Minecart placement 2b2d084a Add InventoryView#getSlotType 01a9959a Do not use deprecated ItemSpawnEvent constructor 9642498d SPIGOT-4547: Call EntitySpawnEvent as general spawn fallback event 963f4a5f Add PlayerItemDamageEvent 63db0445 Add API to get / set base arrow damage 531c25d7 Add CraftMagicNumbers.MAPPINGS_VERSION for use by NMS plugins d05c8b14 Mappings Update bd36e200 SPIGOT-4551: Ignore invalid attribute modifier slots Spigot Changes: 518206a1 Remove redundant trove depend 1959ad21 MC-11211,SPIGOT-4552: Fix placing double slabs at y = 255 29ab5e43 SPIGOT-3661: Allow arguments in restart-script 7cc46316 SPIGOT-852: Growth modifiers for beetroots, potatoes, carrots 82e117e1 Squelch "fatal: Resolve operation not in progress" message 0a1a68e7 Mappings Update & Patch Rebuild
2019-01-01 03:15:55 +00:00
@@ -58,7 +58,8 @@ public class NameReferencingFileConverter {
NOT FINISHED! even more 1.13-pre patches!
2018-07-16 20:08:09 +00:00
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()
Add Velocity IP forwarding support (#1557) While Velocity supports BungeeCord-style IP forwarding, it is not secure. Users have a lot of problems setting up firewalls or setting up plugins like IPWhitelist. Further, the BungeeCord IP forwarding protocol still retains essentially its original form, when there is brand new support for custom login plugin messages in 1.13. Velocity's modern IP forwarding uses an HMAC-SHA256 code to ensure authenticity of messages, is packed into a binary format that is smaller than BungeeCord's forwarding, and is integrated into the Minecraft login process by using the 1.13 login plugin message packet.
2018-10-19 00:44:59 +00:00
+ || (com.destroystokyo.paper.PaperConfig.isProxyOnlineMode())) { // Spigot: bungee = online mode, for now. // Paper - Handle via setting
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
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
Initial work on 1.14 pre-5
2019-04-23 04:47:07 +00:00
index b0ae0365e0..c26da09849 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
[Auto] Updated Upstream (CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes: 7c395d42 SPIGOT-4681: Note about additional world creation on STARTUP
2019-04-08 10:51:36 +00:00
@@ -1413,7 +1413,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()
Add Velocity IP forwarding support (#1557) While Velocity supports BungeeCord-style IP forwarding, it is not secure. Users have a lot of problems setting up firewalls or setting up plugins like IPWhitelist. Further, the BungeeCord IP forwarding protocol still retains essentially its original form, when there is brand new support for custom login plugin messages in 1.13. Velocity's modern IP forwarding uses an HMAC-SHA256 code to ensure authenticity of messages, is packed into a binary format that is smaller than BungeeCord's forwarding, and is integrated into the Minecraft login process by using the 1.13 login plugin message packet.
2018-10-19 00:44:59 +00:00
+ || com.destroystokyo.paper.PaperConfig.isProxyOnlineMode()) // Paper - Handle via setting
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
{
profile = console.getUserCache().getProfile( name );
}
--
[Auto] Updated Upstream (CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes: 7c395d42 SPIGOT-4681: Note about additional world creation on STARTUP
2019-04-08 10:51:36 +00:00
2.21.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