Merge branch 'quality_assurance' of bitbucket.org:projectswg/holocore into quality_assurance

This commit is contained in:
Obique PSWG
2016-04-13 10:29:38 -05:00
18 changed files with 8986 additions and 8939 deletions
+3 -1
View File
@@ -46,6 +46,8 @@ import intents.network.InboundPacketIntent;
import intents.network.OutboundPacketIntent;
import intents.server.ServerManagementIntent;
import intents.server.ServerStatusIntent;
import java.time.OffsetTime;
import java.time.ZoneOffset;
import resources.Galaxy;
import resources.Galaxy.GalaxyStatus;
import resources.config.ConfigFile;
@@ -261,7 +263,7 @@ public class CoreManager extends Manager {
GALAXY.setName(c.getString("GALAXY-NAME", "Holocore"));
GALAXY.setAddress("");
GALAXY.setPopulation(0);
GALAXY.setTimeZone(c.getInt("GALAXY-TIMEZONE", -6));
GALAXY.setZoneOffset(OffsetTime.now().getOffset());
GALAXY.setZonePort(0);
GALAXY.setPingPort(0);
GALAXY.setStatus(GalaxyStatus.DOWN);