From a0847b8d1af18d05b17126fd9c9121a450e74ea9 Mon Sep 17 00:00:00 2001 From: cnr Date: Thu, 14 Jul 2016 08:08:24 -0500 Subject: [PATCH] Fix null ServerGroup uptimes value for MPSes --- .../src/mineplex/core/personalServer/PersonalServerManager.java | 2 +- .../src/mineplex/serverdata/data/ServerGroup.java | 2 +- .../src/nautilus/game/arcade/managers/ServerUptimeManager.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/personalServer/PersonalServerManager.java b/Plugins/Mineplex.Core/src/mineplex/core/personalServer/PersonalServerManager.java index 870c756ea..10648f4ed 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/personalServer/PersonalServerManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/personalServer/PersonalServerManager.java @@ -159,7 +159,7 @@ public class PersonalServerManager extends MiniPlugin } } - final ServerGroup serverGroup = new ServerGroup(serverName, serverName, host.getName(), ram, cpu, 1, 0, UtilMath.random.nextInt(250) + 19999, null, true, "arcade.zip", "Arcade.jar", "plugins/Arcade/", minPlayers, maxPlayers, + final ServerGroup serverGroup = new ServerGroup(serverName, serverName, host.getName(), ram, cpu, 1, 0, UtilMath.random.nextInt(250) + 19999, "", true, "arcade.zip", "Arcade.jar", "plugins/Arcade/", minPlayers, maxPlayers, true, false, false, games, "", "", "Player", true, event, false, true, false, true, true, false, false, false, false, true, true, true, false, false, "", _us ? Region.US : Region.EU, "", "", "", ""); getPlugin().getServer().getScheduler().runTaskAsynchronously(getPlugin(), new Runnable() diff --git a/Plugins/Mineplex.ServerData/src/mineplex/serverdata/data/ServerGroup.java b/Plugins/Mineplex.ServerData/src/mineplex/serverdata/data/ServerGroup.java index da2a1d74e..eb5541a00 100644 --- a/Plugins/Mineplex.ServerData/src/mineplex/serverdata/data/ServerGroup.java +++ b/Plugins/Mineplex.ServerData/src/mineplex/serverdata/data/ServerGroup.java @@ -24,7 +24,7 @@ public class ServerGroup private int _requiredTotalServers; private int _requiredJoinableServers; - private String _uptimes; + private String _uptimes = ""; private boolean _arcadeGroup; private String _worldZip; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/ServerUptimeManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/ServerUptimeManager.java index c00df712e..963449a38 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/ServerUptimeManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/ServerUptimeManager.java @@ -169,7 +169,7 @@ public class ServerUptimeManager implements Listener public void updateDates(String uptimes) { System.out.println(uptimes); - if (Manager.GetServerConfig().Uptimes == null) + if (Manager.GetServerConfig().Uptimes.isEmpty()) { _enabled = false; return;