Waterfall/BungeeCord-Patches/0029-Configurable-server-version-in-ping-response.patch

84 lines
3.2 KiB
Diff
Raw Normal View History

From decc1bf40862deeb8d038607398fa2b368721f10 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 dc4d609f..db615ed9 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
@@ -169,6 +169,13 @@ public interface ProxyConfig
// Waterfall Options
//
+ /**
+ * The supported versions
+ *
+ * @return the supported versions
+ */
+ String getGameVersion();
+
// Throttling options
/**
2016-11-26 21:39:19 +01:00
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
2016-11-26 21:39:19 +01:00
--- 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 @@
2018-07-22 18:40:31 +02:00
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;
2018-07-22 18:40:31 +02:00
import java.io.File;
public class WaterfallConfiguration extends Configuration {
+ /**
+ * The supported versions displayed to the client
2018-07-22 18:40:31 +02:00
+ * <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();
2018-07-22 18:40:31 +02:00
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);
}
2018-07-22 18:40:31 +02:00
+ @Override
+ public String getGameVersion() {
+ return gameVersion;
+ }
+
2016-11-26 21:39:19 +01:00
@Override
2018-07-22 18:40:31 +02:00
public int getTabThrottle() {
return tabThrottle;
2016-11-26 21:39:19 +01:00
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 0ff6781c..083bc177 100644
2016-11-26 21:39:19 +01:00
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -650,7 +650,7 @@ public class BungeeCord extends ProxyServer
2016-11-26 21:39:19 +01:00
@Override
public String getGameVersion()
{
- return ProtocolConstants.SUPPORTED_VERSIONS.get( 0 ) + "-" + ProtocolConstants.SUPPORTED_VERSIONS.get( ProtocolConstants.SUPPORTED_VERSIONS.size() - 1 );
2016-11-26 21:39:19 +01:00
+ return getConfig().getGameVersion(); // Waterfall
}
@Override
--
2.21.0