From 5652882134eb30c47e61a1a99847c40940b7acc8 Mon Sep 17 00:00:00 2001 From: David Date: Sat, 21 Jun 2025 13:09:44 +0200 Subject: [PATCH] Add `isProxyEnabled` method to ServerConfiguration (#12664) --- .../papermc/paper/configuration/ServerConfiguration.java | 9 +++++++++ .../paper/configuration/PaperServerConfiguration.java | 7 +++++++ 2 files changed, 16 insertions(+) diff --git a/paper-api/src/main/java/io/papermc/paper/configuration/ServerConfiguration.java b/paper-api/src/main/java/io/papermc/paper/configuration/ServerConfiguration.java index 86d1b609b8b..a58e241945d 100644 --- a/paper-api/src/main/java/io/papermc/paper/configuration/ServerConfiguration.java +++ b/paper-api/src/main/java/io/papermc/paper/configuration/ServerConfiguration.java @@ -21,4 +21,13 @@ public interface ServerConfiguration { * @return whether the server is in online mode or behind a proxy configured for online mode */ boolean isProxyOnlineMode(); + + /** + * Gets whether the server is configured to work behind a proxy. + *

+ * This returns true if either Velocity or BungeeCord is enabled. + * + * @return whether the server is configured to work behind a proxy + */ + boolean isProxyEnabled(); } diff --git a/paper-server/src/main/java/io/papermc/paper/configuration/PaperServerConfiguration.java b/paper-server/src/main/java/io/papermc/paper/configuration/PaperServerConfiguration.java index 14d0965f4cf..b957d583711 100644 --- a/paper-server/src/main/java/io/papermc/paper/configuration/PaperServerConfiguration.java +++ b/paper-server/src/main/java/io/papermc/paper/configuration/PaperServerConfiguration.java @@ -1,9 +1,16 @@ package io.papermc.paper.configuration; +import org.spigotmc.SpigotConfig; + public class PaperServerConfiguration implements ServerConfiguration { @Override public boolean isProxyOnlineMode() { return GlobalConfiguration.get().proxies.isProxyOnlineMode(); } + + @Override + public boolean isProxyEnabled() { + return GlobalConfiguration.get().proxies.velocity.enabled || SpigotConfig.bungee; + } }