servergroup fallback data

Plugins[Modified]/Mineplex.ServerData/src/mineplex/serverdata/data/ServerGroup.java

@@ -76,26 +76,26 @@ public class ServerGroup
 	{
 		_name = data.get("name");
 		_prefix = data.get("prefix");
-		_requiredRam = Integer.valueOf(data.get("ram"));
-		_requiredCpu = Integer.valueOf(data.get("cpu"));
-		_requiredTotalServers = Integer.valueOf(data.get("totalServers"));
-		_requiredJoinableServers = Integer.valueOf(data.get("joinableServers"));
-		_portSection = Integer.valueOf(data.get("portSection"));
+		_requiredRam = Integer.valueOf(data.getOrDefault("ram", "512"));
+		_requiredCpu = Integer.valueOf(data.getOrDefault("cpu", "1"));
+		_requiredTotalServers = Integer.valueOf(data.getOrDefault("totalServers", "1"));
+		_requiredJoinableServers = Integer.valueOf(data.getOrDefault("joinableServers", "1"));
+		_portSection = Integer.valueOf(data.getOrDefault("portSection", "25565"));
 		_uptimes = data.getOrDefault("uptimes", "");
-		_arcadeGroup = Boolean.valueOf(data.get("arcadeGroup"));
+		_arcadeGroup = Boolean.valueOf(data.getOrDefault("arcadeGroup", "true")); //assuming you use this for arcade only, who tf runs hub ??
 		_worldZip = data.get("worldZip");
 		_plugin = data.get("plugin");
 		_configPath = data.get("configPath");
-		_minPlayers = Integer.valueOf(data.get("minPlayers"));
-		_maxPlayers = Integer.valueOf(data.get("maxPlayers"));
-		_pvp = Boolean.valueOf(data.get("pvp"));
+		_minPlayers = Integer.valueOf(data.getOrDefault("minPlayers", "1"));
+		_maxPlayers = Integer.valueOf(data.getOrDefault("maxPlayers", "100"));
+		_pvp = Boolean.valueOf(data.getOrDefault("pvp", "true"));
 		_tournament = Boolean.valueOf(data.get("tournament"));
 		_tournamentPoints = Boolean.valueOf(data.get("tournamentPoints"));
 		_hardMaxPlayerCap = Boolean.valueOf(data.get("hardMaxPlayerCap"));
 		_games = data.get("games");
 		_modes = data.get("modes");
 		_boosterGroup = data.get("boosterGroup");
-		_serverType = data.get("serverType");
+		_serverType = data.getOrDefault("serverType", "dedicated");
 		_addNoCheat = Boolean.valueOf(data.get("addNoCheat"));
 		_addWorldEdit = Boolean.valueOf(data.get("addWorldEdit"));
 		_teamRejoin = Boolean.valueOf(data.get("teamRejoin"));

Plugins[Modified]/Mineplex.ServerData/src/mineplex/serverdata/database/DBPool.java

@@ -8,6 +8,7 @@ import java.nio.file.Files;
 import java.sql.Connection;
 import java.util.List;
 
+import mineplex.serverdata.data.Data;
 import org.apache.commons.dbcp2.BasicDataSource;
 
 public final class DBPool
@@ -133,22 +134,22 @@ public final class DBPool
 			String userName = args[2];
 			String password = args[3];
 
-			// System.out.println(dbSource + " " + dbHost + " " + userName + " " + password);
+			DataSource dataSource = openDataSource("jdbc:mysql://" + dbHost + "/" + dbSource.toLowerCase(), userName, password);;
 
 			if (dbSource.toUpperCase().equalsIgnoreCase("ACCOUNT"))
-				ACCOUNT = openDataSource("jdbc:mysql://" + dbHost, userName, password);
+				ACCOUNT = dataSource;
 			else if (dbSource.toUpperCase().equalsIgnoreCase("QUEUE"))
-				QUEUE = openDataSource("jdbc:mysql://" + dbHost, userName, password);
+				QUEUE = dataSource;
 			else if (dbSource.toUpperCase().equalsIgnoreCase("MINEPLEX"))
-				MINEPLEX = openDataSource("jdbc:mysql://" + dbHost, userName, password);
+				MINEPLEX = dataSource;
 			else if (dbSource.toUpperCase().equalsIgnoreCase("MINEPLEX_STATS"))
-				MINEPLEX_STATS = openDataSource("jdbc:mysql://" + dbHost, userName, password);
+				MINEPLEX_STATS = dataSource;
 			else if (dbSource.toUpperCase().equalsIgnoreCase("PLAYER_STATS"))
-				PLAYER_STATS = openDataSource("jdbc:mysql://" + dbHost, userName, password);
+				PLAYER_STATS = dataSource;
 			else if (dbSource.toUpperCase().equalsIgnoreCase("SERVER_STATS"))
-				SERVER_STATS = openDataSource("jdbc:mysql://" + dbHost, userName, password);
+				SERVER_STATS = dataSource;
 			else if (dbSource.toUpperCase().equalsIgnoreCase("MSSQL_MOCK"))
-				MSSQL_MOCK = openDataSource("jdbc:mysql://" + dbHost, userName, password);
+				MSSQL_MOCK = dataSource;
 		}
 	}
 }

Plugins[Modified]/Mineplex.ServerData/src/mineplex/serverdata/redis/RedisConfig.java

@@ -10,7 +10,7 @@ import mineplex.serverdata.servers.ConnectionData.ConnectionType;
 public class RedisConfig 
 {
 	// Failsafe values in case configuration is not provided
-	private static final String DEFAULT_IP = "10.3.203.80";
+	private static final String DEFAULT_IP = "127.0.0.1";
 	private static final int DEFAULT_PORT = 6379;
 	private static Random random = new Random();	// Utility random
 	

Plugins[Modified]/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java

@@ -2,7 +2,7 @@ package nautilus.game.arcade;
 
 import java.io.File;
 
-import mineplex.core.TwitchIntegrationFix;
+//import mineplex.core.TwitchIntegrationFix;
 import net.minecraft.server.v1_8_R3.MinecraftServer;
 
 import org.bukkit.Bukkit;
@@ -71,7 +71,7 @@ import mineplex.core.stats.StatsManager;
 import mineplex.core.status.ServerStatusManager;
 import mineplex.core.teleport.Teleport;
 import mineplex.core.thank.ThankManager;
-import mineplex.core.twofactor.TwoFactorAuth;
+//import mineplex.core.twofactor.TwoFactorAuth;
 import mineplex.core.updater.FileUpdater;
 import mineplex.core.updater.Updater;
 import mineplex.core.velocity.VelocityFix;
@@ -205,9 +205,10 @@ public class Arcade extends JavaPlugin
 		new PacketsInteractionFix(this, packetHandler);
 		new FoodDupeFix(this);
 
-		require(TwoFactorAuth.class);
+		//two factor is mad annoying`
+		//require(TwoFactorAuth.class);
 		require(WebsiteLinkManager.class);
-		require(TwitchIntegrationFix.class);
+		//require(TwitchIntegrationFix.class);
 		
 		AprilFoolsManager.getInstance();
 

Plugins[Modified]/Nautilus.Game.Arcade/src/nautilus/game/arcade/gametutorial/GameTutorial.java

@@ -265,6 +265,7 @@ public abstract class GameTutorial
 			_hasEnded = true;
 			Thread thread = _currentPhase.getThread(); 
 			if (thread.isAlive())
+				//?
 				thread.destroy();
 				
 			endTutorial();