mirror of
https://github.com/PaperMC/Waterfall.git
synced 2025-01-08 08:57:39 +01:00
d6688e05e6
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing BungeeCord Changes: 511017ab #3396: Update Netty version c3e8cfac #3374, #3389: Improve log handling of normal java.util Logger usage by forwarding the LogRecords directly to the BungeeLogger instead of the fallback err stream. bf2b3c68 #3384: Update documentation of ProxyPingEvent 68e74a8c #3378: Remove KickStringWriter from the pipeline after handshake arrives 5b4a5404 #3361: Cache MessageFormats for translations 88da5c05 #3353: Update GitHub actions
84 lines
3.2 KiB
Diff
84 lines
3.2 KiB
Diff
From 6aed025ba52a9bcfaca7663d6a06afd04d219630 Mon Sep 17 00:00:00 2001
|
|
From: Troy Frew <fuzzy_bot@arenaga.me>
|
|
Date: Wed, 29 Jun 2016 13:56:57 -0500
|
|
Subject: [PATCH] Configurable server version in ping response
|
|
|
|
|
|
diff --git a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
|
|
index edbae4ea..749059ab 100644
|
|
--- a/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
|
|
+++ b/api/src/main/java/net/md_5/bungee/api/ProxyConfig.java
|
|
@@ -214,6 +214,13 @@ public interface ProxyConfig
|
|
// Waterfall Options
|
|
//
|
|
|
|
+ /**
|
|
+ * The supported versions
|
|
+ *
|
|
+ * @return the supported versions
|
|
+ */
|
|
+ String getGameVersion();
|
|
+
|
|
// Throttling options
|
|
|
|
/**
|
|
diff --git a/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java b/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
|
|
index 91743f01..111404fb 100644
|
|
--- a/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
|
|
+++ b/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
|
|
@@ -1,12 +1,20 @@
|
|
package io.github.waterfallmc.waterfall.conf;
|
|
|
|
+import com.google.common.base.Joiner;
|
|
import net.md_5.bungee.conf.Configuration;
|
|
import net.md_5.bungee.conf.YamlConfig;
|
|
+import net.md_5.bungee.protocol.ProtocolConstants;
|
|
|
|
import java.io.File;
|
|
|
|
public class WaterfallConfiguration extends Configuration {
|
|
|
|
+ /**
|
|
+ * The supported versions displayed to the client
|
|
+ * <p>Default is a comma separated list of supported versions. For example 1.8.x, 1.9.x, 1.10.x</p>
|
|
+ */
|
|
+ private String gameVersion;
|
|
+
|
|
/*
|
|
* Throttling options
|
|
* Helps prevent players from overloading the servers behind us
|
|
@@ -26,11 +34,17 @@ public class WaterfallConfiguration extends Configuration {
|
|
super.load();
|
|
YamlConfig config = new YamlConfig(new File("waterfall.yml"));
|
|
config.load(false); // Load, but no permissions
|
|
+ gameVersion = config.getString("game_version", "").isEmpty() ? Joiner.on(", ").join(ProtocolConstants.SUPPORTED_VERSIONS) : config.getString("game_version", "");
|
|
// Throttling options
|
|
tabThrottle = config.getInt("throttling.tab_complete", tabThrottle);
|
|
disableModernTabLimiter = config.getBoolean("disable_modern_tab_limiter", disableModernTabLimiter);
|
|
}
|
|
|
|
+ @Override
|
|
+ public String getGameVersion() {
|
|
+ return gameVersion;
|
|
+ }
|
|
+
|
|
@Override
|
|
public int getTabThrottle() {
|
|
return tabThrottle;
|
|
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
|
|
index 8f6923a5..a1ec1c17 100644
|
|
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
|
|
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
|
|
@@ -714,7 +714,7 @@ public class BungeeCord extends ProxyServer
|
|
@Override
|
|
public String getGameVersion()
|
|
{
|
|
- return ProtocolConstants.SUPPORTED_VERSIONS.get( 0 ) + "-" + ProtocolConstants.SUPPORTED_VERSIONS.get( ProtocolConstants.SUPPORTED_VERSIONS.size() - 1 );
|
|
+ return getConfig().getGameVersion(); // Waterfall
|
|
}
|
|
|
|
@Override
|
|
--
|
|
2.38.1
|
|
|