Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex

This commit is contained in:
Jonathan Williams 2015-05-17 13:46:46 -07:00
commit 375b23db3c

View File

@ -1,6 +1,7 @@
package mineplex.serverdata.servers;
import java.io.File;
import java.nio.charset.Charset;
import java.nio.file.Files;
import java.util.ArrayList;
import java.util.HashMap;
@ -90,7 +91,7 @@ public class ServerManager
if (configFile.exists())
{
List<String> lines = Files.readAllLines(configFile.toPath());
List<String> lines = Files.readAllLines(configFile.toPath(), Charset.defaultCharset());
ConnectionData master = deserializeConnection(lines.get(0));
List<ConnectionData> slaves = new ArrayList<ConnectionData>();