From 3a6adac68128af043f4e9c9c4ac250877e08b980 Mon Sep 17 00:00:00 2001
From: Obique <obique.pswg@gmail.com>
Date: Fri, 16 Jan 2015 02:04:25 -0600
Subject: [PATCH] Added GalaxyStatus enum

---
 src/services/CoreManager.java         | 5 +++++
 src/services/player/LoginService.java | 5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/services/CoreManager.java b/src/services/CoreManager.java
index 11d662574..45f687887 100644
--- a/src/services/CoreManager.java
+++ b/src/services/CoreManager.java
@@ -15,6 +15,7 @@ import network.packets.swg.zone.baselines.Baseline;
 import intents.InboundPacketIntent;
 import intents.OutboundPacketIntent;
 import resources.Galaxy;
+import resources.Galaxy.GalaxyStatus;
 import resources.config.ConfigFile;
 import resources.control.Intent;
 import resources.control.Manager;
@@ -83,6 +84,10 @@ public class CoreManager extends Manager {
 		}
 	}
 	
+	public GalaxyStatus getGalaxyStatus() {
+		return galaxy.getStatus();
+	}
+	
 	private void outputPacket(int indent, Packet packet) {
 		if (packet instanceof DataChannelA) {
 			for (SWGPacket p : ((DataChannelA) packet).getPackets()) {
diff --git a/src/services/player/LoginService.java b/src/services/player/LoginService.java
index 70c1f0892..b9d1454ea 100644
--- a/src/services/player/LoginService.java
+++ b/src/services/player/LoginService.java
@@ -30,6 +30,7 @@ import network.packets.swg.login.ServerString;
 import network.packets.swg.login.StationIdHasJediSlot;
 import resources.Galaxy;
 import resources.Race;
+import resources.Galaxy.GalaxyStatus;
 import resources.config.ConfigFile;
 import resources.control.Service;
 import resources.player.AccessLevel;
@@ -198,8 +199,8 @@ public class LoginService extends Service {
 			g.setOnlineFreeTrialLimit(c.getInt("GALAXY-MAX-ONLINE", 3000));
 			g.setRecommended(true);
 			// If locked, restricted, or full
-			if (p.getAccessLevel() == AccessLevel.ADMIN && g.getStatus() >= 3)
-				g.setStatus(2);
+			if (p.getAccessLevel() == AccessLevel.ADMIN && g.getStatus() != GalaxyStatus.UP)
+				g.setStatus(GalaxyStatus.UP);
 			galaxies.add(g);
 		}
 		return galaxies;