mirror of
https://github.com/PaperMC/Waterfall.git
synced 2024-11-16 07:15:14 +01:00
77 lines
2.8 KiB
Diff
77 lines
2.8 KiB
Diff
From ef40f84049f7b8e335ca901484d48940b1894b56 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 f04e2bf..a443614 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
|
|
@@ -168,6 +168,11 @@ public interface ProxyConfig
|
|
*/
|
|
boolean isLogServerListPing();
|
|
|
|
+ /**
|
|
+ * 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 68f2546..5983581 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
|
|
@@ -4,8 +4,11 @@ import lombok.*;
|
|
|
|
import java.io.File;
|
|
|
|
+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;
|
|
|
|
public class WaterfallConfiguration extends Configuration {
|
|
|
|
@@ -23,6 +26,13 @@ public class WaterfallConfiguration extends Configuration {
|
|
*/
|
|
private boolean logServerListPing = false;
|
|
|
|
+ /**
|
|
+ * The supported versions displayed to the client
|
|
+ * <p>Default is a comma seperated list of supported versions. For example 1.8.x, 1.9.x, 1.10.x</p>
|
|
+ */
|
|
+ @Getter
|
|
+ private String gameVersion;
|
|
+
|
|
/*
|
|
* Throttling options
|
|
* Helps prevent players from overloading the servers behind us
|
|
@@ -45,6 +55,7 @@ public class WaterfallConfiguration extends Configuration {
|
|
logServerListPing = config.getBoolean( "log_server_list_ping", logServerListPing );
|
|
// Throttling options
|
|
tabThrottle = config.getInt("throttling.tab_complete", tabThrottle);
|
|
+ gameVersion = config.getString("game_version", "").isEmpty() ? Joiner.on(", ").join(ProtocolConstants.SUPPORTED_VERSIONS) : config.getString("game_version", "");
|
|
}
|
|
|
|
@Override
|
|
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 239027d..2f8b16f 100644
|
|
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
|
|
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
|
|
@@ -612,7 +612,7 @@ public class BungeeCord extends ProxyServer
|
|
@Override
|
|
public String getGameVersion()
|
|
{
|
|
- return Joiner.on( ", " ).join( ProtocolConstants.SUPPORTED_VERSIONS );
|
|
+ return getConfig().getGameVersion(); // Waterfall
|
|
}
|
|
|
|
@Override
|
|
--
|
|
2.10.0
|
|
|