From 18c0844b8735685f2f09fb25a65c3db9aa67a02c Mon Sep 17 00:00:00 2001 From: RhysB Date: Mon, 23 Nov 2020 22:37:59 +1000 Subject: [PATCH] Don't try and use serverlist-port or serverlist-ip --- src/MineOnlineBroadcast.java | 4 ++-- .../mineonline/plugin/bukkit/MineOnlineBroadcastPlugin.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/MineOnlineBroadcast.java b/src/MineOnlineBroadcast.java index dd95d50..ef43b00 100644 --- a/src/MineOnlineBroadcast.java +++ b/src/MineOnlineBroadcast.java @@ -188,11 +188,11 @@ public class MineOnlineBroadcast extends Plugin { String ip = mineOnlineConfig.getConfigString("serverlist-ip"); if (ip == null) { - ip = propertiesFile.getProperty("serverlist-ip", propertiesFile.getProperty("server-ip", propertiesFile.getProperty("ip", null))); + ip = propertiesFile.getProperty("server-ip", propertiesFile.getProperty("ip", null)); } String port = mineOnlineConfig.getConfigString("serverlist-port"); if (port == null) { - port = propertiesFile.getProperty("serverlist-port", propertiesFile.getProperty("server-port", propertiesFile.getProperty("port", "25565"))); + port = propertiesFile.getProperty("server-port", propertiesFile.getProperty("port", "25565")); } int users = etc.getServer().getPlayerList().size(); int maxUsers = Integer.parseInt(propertiesFile.getProperty("max-players", "20")); diff --git a/src/gg/codie/mineonline/plugin/bukkit/MineOnlineBroadcastPlugin.java b/src/gg/codie/mineonline/plugin/bukkit/MineOnlineBroadcastPlugin.java index ca1462b..825a60d 100644 --- a/src/gg/codie/mineonline/plugin/bukkit/MineOnlineBroadcastPlugin.java +++ b/src/gg/codie/mineonline/plugin/bukkit/MineOnlineBroadcastPlugin.java @@ -169,11 +169,11 @@ public class MineOnlineBroadcastPlugin extends JavaPlugin { String ip = mineOnlineConfig.getConfigString("serverlist-ip"); if(ip == null) { - ip = propertiesFile.getProperty("serverlist-ip", propertiesFile.getProperty("server-ip", propertiesFile.getProperty("ip", null))); + ip = propertiesFile.getProperty("server-ip", propertiesFile.getProperty("ip", null)); } String port = mineOnlineConfig.getConfigString("serverlist-port"); if(port == null) { - propertiesFile.getProperty("serverlist-port", propertiesFile.getProperty("server-port", propertiesFile.getProperty("port", "25565"))); + propertiesFile.getProperty("server-port", propertiesFile.getProperty("port", "25565")); } int users = getServer().getOnlinePlayers().length; int maxUsers = Integer.parseInt(propertiesFile.getProperty("max-players", "20"));