MiniDay/hamster-ball
1
0
Fork 0
Code Issues Pull Requests Actions Releases 9 Activity

feat: 更改系统环境参数

Browse Source
This commit is contained in:
叁只仓鼠
2023-07-30 22:02:48 +08:00
parent 437668ee13
commit 2b191b3adc
3 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ball-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/api/BallBungeeCordAPI.java
View File

@@ -8,6 +8,8 @@ import cn.hamster3.mc.plugin.ball.common.listener.BallDebugListener;
import cn.hamster3.mc.plugin.core.bungee.HamsterBallPlugin;
import cn.hamster3.mc.plugin.core.bungee.listener.BallBungeeCordListener;
import cn.hamster3.mc.plugin.core.bungee.util.CoreBungeeCordUtils;
import net.md_5.bungee.api.ProxyServer;
import net.md_5.bungee.api.config.ListenerInfo;
import net.md_5.bungee.config.Configuration;
import org.jetbrains.annotations.NotNull;
@@ -32,14 +34,17 @@ public class BallBungeeCordAPI extends BallAPI {
Configuration pluginConfig = CoreBungeeCordUtils.getPluginConfig(plugin);
Map<String, String> env = System.getenv();
String serverInfoID = env.getOrDefault("BALL_SERVER_INFO_ID",
String serverInfoID = env.getOrDefault("BALL_LOCAL_SERVER_INFO_ID",
pluginConfig.getString("server-info.id"));
String serverInfoName = env.getOrDefault("BALL_SERVER_INFO_NAME",
String serverInfoName = env.getOrDefault("BALL_LOCAL_SERVER_INFO_NAME",
pluginConfig.getString("server-info.name"));
String serverInfoHost = env.getOrDefault("SERVER_IP",
String serverInfoHost = env.getOrDefault("BALL_LOCAL_SERVER_IP",
pluginConfig.getString("server-info.host", "0.0.0.0"));
int serverInfoPort = Integer.parseInt(env.getOrDefault("SERVER_PORT",
String.valueOf(pluginConfig.getInt("server-info.port", 25577))));
int port = ProxyServer.getInstance().getConfig().getListeners().stream().findFirst()
.map(ListenerInfo::getQueryPort)
.orElse(25577);
int serverInfoPort = Integer.parseInt(env.getOrDefault("BALL_LOCAL_SERVER_PORT",
String.valueOf(pluginConfig.getInt("server-info.port", port))));
BallServerInfo serverInfo = new BallServerInfo(
serverInfoID,
serverInfoName,