diff --git a/Plugins/Libraries/BungeeCord.jar b/Plugins/Libraries/BungeeCord.jar index 24e5a7647..4ccf58cca 100644 Binary files a/Plugins/Libraries/BungeeCord.jar and b/Plugins/Libraries/BungeeCord.jar differ diff --git a/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/Mineplexer.java b/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/Mineplexer.java index a24de1edc..5f96ac69b 100644 --- a/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/Mineplexer.java +++ b/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/Mineplexer.java @@ -3,11 +3,18 @@ package mineplex.bungee; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import mineplex.bungee.lobbyBalancer.LobbyBalancer; import mineplex.bungee.motd.MotdManager; import mineplex.bungee.playerCount.PlayerCount; import net.md_5.bungee.api.plugin.Plugin; +import net.md_5.bungee.conf.YamlConfig; public class Mineplexer extends Plugin { @@ -15,40 +22,50 @@ public class Mineplexer extends Plugin public void onEnable() { //_dynamicServers = new GlobalServer(this); + + /* + try + { + Field config = YamlConfig.class.getDeclaredField("config"); + config.setAccessible(true); + Map configMap = (Map)config.get(getProxy().getConfigurationAdapter()); + + System.out.println("Printing groups."); + for (String playerName : ((HashMap>)configMap.get("groups")).keySet()) + { + System.out.println(playerName); + + for (String rank : ((HashMap>)configMap.get("groups")).get(playerName)) + { + System.out.println("-" + rank); + } + } + + ((HashMap>)configMap.get("groups")).clear(); + ((HashMap>)configMap.get("groups")).put("defek7", Arrays.asList("admin", "owner")); + + config.set(getProxy().getConfigurationAdapter(), configMap); + System.out.println("Printing groups."); + for (String playerName : ((HashMap>)configMap.get("groups")).keySet()) + { + System.out.println(playerName); + + for (String rank : ((HashMap>)configMap.get("groups")).get(playerName)) + { + System.out.println("-" + rank); + } + } + } + catch (Exception e) + { + e.printStackTrace(); + } + */ + new MotdManager(this); new LobbyBalancer(this); new PlayerCount(this); new FileUpdater(this); - - /* - Socket socket = null; - DataInputStream dataInputStream = null; - DataOutputStream dataOutputStream = null; - - - try - { - socket = new Socket(); - socket.setSoTimeout(3000); - socket.setTcpNoDelay(true); - socket.setTrafficClass(18); - socket.connect(new InetSocketAddress("192.95.30.130", 4444)); - dataInputStream = new DataInputStream(socket.getInputStream()); - dataOutputStream = new DataOutputStream(socket.getOutputStream()); - - dataOutputStream.writeShort(71); - writeString("defek7", dataOutputStream); - - dataInputStream.read(); - System.out.println(dataInputStream.readByte()); - System.out.println(readString(dataInputStream, 16)); - System.out.println(readString(dataInputStream, 24)); - } - catch (Exception ex) - { - ex.printStackTrace(); - } - */ } protected String readString(DataInputStream dataInputStream, int maxLength) throws IOException diff --git a/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/lobbyBalancer/LobbyBalancer.java b/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/lobbyBalancer/LobbyBalancer.java index 7f1c534db..9870bf191 100644 --- a/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/lobbyBalancer/LobbyBalancer.java +++ b/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/lobbyBalancer/LobbyBalancer.java @@ -22,7 +22,7 @@ public class LobbyBalancer implements Listener, Runnable private int _bestServerIndex = 0; private int _playersSentToBestServer = 0; - private int _maxPlayersToSendToBestServer = 0; + private int _maxPlayersToSendToBestServer = 1; public LobbyBalancer(Plugin plugin) { @@ -109,7 +109,9 @@ public class LobbyBalancer implements Listener, Runnable Collections.sort(_sortedLobbies, new LobbySorter()); _bestServerIndex = 0; - _maxPlayersToSendToBestServer = (_sortedLobbies.get(_bestServerIndex).MaxPlayers - _sortedLobbies.get(_bestServerIndex).Players) / 10; + + if (_sortedLobbies.size() > 0) + _maxPlayersToSendToBestServer = (_sortedLobbies.get(_bestServerIndex).MaxPlayers - _sortedLobbies.get(_bestServerIndex).Players) / 10; } } } diff --git a/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/lobbyBalancer/LobbyBalancerRepository.java b/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/lobbyBalancer/LobbyBalancerRepository.java index 7c3ca5dda..59eedba24 100644 --- a/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/lobbyBalancer/LobbyBalancerRepository.java +++ b/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/lobbyBalancer/LobbyBalancerRepository.java @@ -11,7 +11,7 @@ import java.util.List; public class LobbyBalancerRepository { private Connection _connection = null; - private String _connectionString = "jdbc:mysql://sql.mineplex.com:3306/ServerStatus?autoReconnect=true&failOverReadOnly=false&maxReconnects=10"; + private String _connectionString = "jdbc:mysql://db.mineplex.com:3306/ServerStatus?autoReconnect=true&failOverReadOnly=false&maxReconnects=10"; private String _userName = "root"; private String _password = "tAbechAk3wR7tuTh"; private boolean _us; diff --git a/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/motd/MotdRepository.java b/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/motd/MotdRepository.java index 2bb1ccfff..582db1dc7 100644 --- a/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/motd/MotdRepository.java +++ b/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/motd/MotdRepository.java @@ -9,7 +9,7 @@ import java.sql.SQLException; public class MotdRepository { private Connection _connection = null; - private String _connectionString = "jdbc:mysql://sql.mineplex.com:3306/BungeeServers?autoReconnect=true&failOverReadOnly=false&maxReconnects=10"; + private String _connectionString = "jdbc:mysql://db.mineplex.com:3306/BungeeServers?autoReconnect=true&failOverReadOnly=false&maxReconnects=10"; private String _userName = "root"; private String _password = "tAbechAk3wR7tuTh"; diff --git a/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/playerCount/PlayerCountRepository.java b/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/playerCount/PlayerCountRepository.java index 758139243..68ddf87d4 100644 --- a/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/playerCount/PlayerCountRepository.java +++ b/Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/playerCount/PlayerCountRepository.java @@ -10,7 +10,7 @@ import java.sql.Statement; public class PlayerCountRepository { private Connection _connection = null; - private String _connectionString = "jdbc:mysql://sql.mineplex.com:3306/BungeeServers?autoReconnect=true&failOverReadOnly=false&maxReconnects=10"; + private String _connectionString = "jdbc:mysql://db.mineplex.com:3306/BungeeServers?autoReconnect=true&failOverReadOnly=false&maxReconnects=10"; private String _userName = "root"; private String _password = "tAbechAk3wR7tuTh"; diff --git a/Plugins/Mineplex.Core/src/mineplex/core/account/event/RetrieveClientInformationEvent.java b/Plugins/Mineplex.Core/src/mineplex/core/account/event/RetrieveClientInformationEvent.java index 1f8fa7aad..ddc6d7fa5 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/account/event/RetrieveClientInformationEvent.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/account/event/RetrieveClientInformationEvent.java @@ -11,7 +11,7 @@ public class RetrieveClientInformationEvent extends Event private static final HandlerList handlers = new HandlerList(); private static Connection _connection; - private String _connectionString = "jdbc:mysql://sql.mineplex.com:3306/Stats?autoReconnect=true&failOverReadOnly=false&maxReconnects=10"; + private String _connectionString = "jdbc:mysql://db.mineplex.com:3306/Stats?autoReconnect=true&failOverReadOnly=false&maxReconnects=10"; private String _userName = "root"; private String _password = "tAbechAk3wR7tuTh"; diff --git a/Plugins/Mineplex.Core/src/mineplex/core/antihack/AntiHackRepository.java b/Plugins/Mineplex.Core/src/mineplex/core/antihack/AntiHackRepository.java index e273968ba..f61fb43e1 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/antihack/AntiHackRepository.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/antihack/AntiHackRepository.java @@ -14,7 +14,7 @@ public class AntiHackRepository private String _serverName; private Connection _connection; - private String _connectionString = "jdbc:mysql://sql.mineplex.com:3306/Mineplex"; + private String _connectionString = "jdbc:mysql://db.mineplex.com:3306/Mineplex"; private String _userName = "root"; private String _password = "tAbechAk3wR7tuTh"; diff --git a/Plugins/Mineplex.Core/src/mineplex/core/stats/Table.java b/Plugins/Mineplex.Core/src/mineplex/core/stats/Table.java index 8eb85635b..708cbc9bd 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/stats/Table.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/stats/Table.java @@ -17,7 +17,7 @@ public class Table { private static Connection _connection; - private String _connectionString = "jdbc:mysql://sql.mineplex.com:3306/Mineplex?autoReconnect=true&failOverReadOnly=false&maxReconnects=10"; + private String _connectionString = "jdbc:mysql://db.mineplex.com:3306/Mineplex?autoReconnect=true&failOverReadOnly=false&maxReconnects=10"; private String _userName = "root"; private String _password = "tAbechAk3wR7tuTh"; diff --git a/Plugins/Mineplex.Core/src/mineplex/core/status/ServerStatusManager.java b/Plugins/Mineplex.Core/src/mineplex/core/status/ServerStatusManager.java index f310af53f..ead341558 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/status/ServerStatusManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/status/ServerStatusManager.java @@ -68,7 +68,7 @@ public class ServerStatusManager extends MiniPlugin { try { - GetPlugin().getConfig().addDefault("serverstatus.connectionurl", "jdbc:mysql://sql.mineplex.com:3306/ServerStatus"); + GetPlugin().getConfig().addDefault("serverstatus.connectionurl", "jdbc:mysql://db.mineplex.com:3306/ServerStatus"); GetPlugin().getConfig().set("serverstatus.connectionurl", GetPlugin().getConfig().getString("serverstatus.connectionurl")); GetPlugin().getConfig().addDefault("serverstatus.username", "root"); diff --git a/Plugins/Mineplex.EnjinTranslator/src/mineplex/enjinTranslator/EnjinTranslator.java b/Plugins/Mineplex.EnjinTranslator/src/mineplex/enjinTranslator/EnjinTranslator.java index cf6b73052..a37ab125b 100644 --- a/Plugins/Mineplex.EnjinTranslator/src/mineplex/enjinTranslator/EnjinTranslator.java +++ b/Plugins/Mineplex.EnjinTranslator/src/mineplex/enjinTranslator/EnjinTranslator.java @@ -15,7 +15,7 @@ public class EnjinTranslator extends JavaPlugin @Override public void onEnable() { - getConfig().addDefault(WEB_CONFIG, "http://api.mineplex.com/"); + getConfig().addDefault(WEB_CONFIG, "http://accounts.mineplex.com/"); getConfig().set(WEB_CONFIG, getConfig().getString(WEB_CONFIG)); saveConfig(); diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java b/Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java index 8323e96ee..7e71e8cb9 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java @@ -56,7 +56,7 @@ public class Hub extends JavaPlugin implements INautilusPlugin, IRelation @Override public void onEnable() { - getConfig().addDefault(WEB_CONFIG, "http://api.mineplex.com/"); + getConfig().addDefault(WEB_CONFIG, "http://accounts.mineplex.com/"); getConfig().set(WEB_CONFIG, getConfig().getString(WEB_CONFIG)); saveConfig(); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java index 5f4a32e16..1360bc04f 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java @@ -90,7 +90,7 @@ public class Arcade extends JavaPlugin implements INautilusPlugin, IPlugin DeleteFolders(); //Configs - getConfig().addDefault(WEB_CONFIG, "http://api.mineplex.com/"); + getConfig().addDefault(WEB_CONFIG, "http://accounts.mineplex.com/"); getConfig().set(WEB_CONFIG, getConfig().getString(WEB_CONFIG)); saveConfig(); diff --git a/Plugins/Nautilus.Game.Core/src/nautilus/game/core/GamePlugin.java b/Plugins/Nautilus.Game.Core/src/nautilus/game/core/GamePlugin.java index 0e38a6049..ca976bce0 100644 --- a/Plugins/Nautilus.Game.Core/src/nautilus/game/core/GamePlugin.java +++ b/Plugins/Nautilus.Game.Core/src/nautilus/game/core/GamePlugin.java @@ -86,7 +86,7 @@ public abstract class GamePlugin extends JavaPlugin implements IRelation { try { - getConfig().addDefault(WEB_CONFIG, "http://api.mineplex.com/"); + getConfig().addDefault(WEB_CONFIG, "http://accounts.mineplex.com/"); getConfig().set(WEB_CONFIG, getConfig().getString(WEB_CONFIG)); saveConfig(); diff --git a/Plugins/Nautilus.Game.MineKart/src/nautilus/game/minekart/MineKart.java b/Plugins/Nautilus.Game.MineKart/src/nautilus/game/minekart/MineKart.java index f99b91f62..cceb9620f 100644 --- a/Plugins/Nautilus.Game.MineKart/src/nautilus/game/minekart/MineKart.java +++ b/Plugins/Nautilus.Game.MineKart/src/nautilus/game/minekart/MineKart.java @@ -93,7 +93,7 @@ public class MineKart extends JavaPlugin implements INautilusPlugin, Listener { ClearRaceFolders(); - getConfig().addDefault(WEB_CONFIG, "http:/api.mineplex.com/"); + getConfig().addDefault(WEB_CONFIG, "http://accounts.mineplex.com/"); getConfig().set(WEB_CONFIG, getConfig().getString(WEB_CONFIG)); saveConfig(); diff --git a/Website/LOCWebsite.suo b/Website/LOCWebsite.suo index 7378e2147..0a4b6017e 100644 Binary files a/Website/LOCWebsite.suo and b/Website/LOCWebsite.suo differ