updated Docker support

Server/src/main/java/net/simon987/server/GameServer.java

@@ -50,7 +50,7 @@ public class GameServer implements Runnable {
         this.config = new ServerConfiguration("config.properties");
 
         try{
-	        mongo = new MongoClient("localhost", 27017);
+            mongo = new MongoClient(config.getString("mongo_address"), config.getInt("mongo_port"));
             DB db = mongo.getDB(config.getString("mongo_dbname"));
 
             DBCollection userCollection = db.getCollection("user");

Server/src/main/java/net/simon987/server/user/UserStats.java

@@ -9,12 +9,16 @@ public class UserStats implements MongoSerialisable {
 
     private BasicDBObject stats;
 
-    public UserStats() {
+    UserStats() {
         this.stats = new BasicDBObject();
     }
 
-    public UserStats(BasicDBObject stats) {
-        this.stats = stats;
+    UserStats(BasicDBObject stats) {
+        if (stats != null) {
+            this.stats = stats;
+        } else {
+            this.stats = new BasicDBObject();
+        }
     }
 
     @Override
@@ -95,4 +99,4 @@ public class UserStats implements MongoSerialisable {
 
         return (BasicDBList) stats.get(name);
     }
-}
+}

Server/src/main/resources/config.properties

@@ -13,6 +13,9 @@ server_name=Official MAR server
 
 #Database
 mongo_dbname=mar_beta
+#Change to 'mongodb' to use in docker
+mongo_address=mongodb
+mongo_port=27017
 #Biomass
 biomass_yield=2
 minBiomassCount=3