Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla

2016-02-20 03:30:57 -05:00 · 2016-02-20 03:30:57 -05:00 · 65be5fcd99
parent 3b7a7e457c 3a73b05895
commit 65be5fcd99
2 changed files with 5 additions and 0 deletions
--- a/Plugins/Mineplex.ServerData/src/mineplex/serverdata/database/DBPool.java
+++ b/Plugins/Mineplex.ServerData/src/mineplex/serverdata/database/DBPool.java
@ -79,6 +79,9 @@ public final class DBPool

 	public static DataSource getServerStats()
 	{
+		if (SERVER_STATS == null)
+			loadDataSources();
+
 		return SERVER_STATS;
 	}

--- a/README.md
+++ b/README.md
@ -0,0 +1,2 @@
+# Minecraft-PC
+Minecraft PC Edition