From e7dc937dab5627c0cc6c76fd8f12e468cda484d0 Mon Sep 17 00:00:00 2001
From: Ziggeh <ziggy@projectswg.com>
Date: Thu, 10 Jul 2014 09:22:24 +0200
Subject: [PATCH] Changed ServerStatus to GalaxyStatus

In-game "servers" are refered to as galaxies - not servers. The
datatable has been renamed to reflect that.
---
 scripts/commands/server.py                                | 6 +++---
 src/main/NGECore.java                                     | 8 ++++----
 .../datatables/{ServerStatus.java => GalaxyStatus.java}   | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename src/resources/datatables/{ServerStatus.java => GalaxyStatus.java} (97%)

diff --git a/scripts/commands/server.py b/scripts/commands/server.py
index 0a77dcfc..09765edc 100644
--- a/scripts/commands/server.py
+++ b/scripts/commands/server.py
@@ -1,6 +1,6 @@
 import sys
 from engine.resources.scene import Point3D
-from resources.datatables import ServerStatus
+from resources.datatables import GalaxyStatus
 
 def setup():
     return
@@ -27,9 +27,9 @@ def run(core, actor, target, commandString):
 		return
 	
 	if command == 'lockServer':
-		core.setGalaxyStatus(ServerStatus.Locked)
+		core.setGalaxyStatus(GalaxyStatus.Locked)
 	if command == 'unlockServer':
-		core.setGalaxyStatus(ServerStatus.Online)
+		core.setGalaxyStatus(GalaxyStatus.Online)
 	if command == 'info':
 		actor.sendSystemMessage(str(core.getActiveZoneClients()) + ' online characters.', 0)
 	if command == 'shutdown':
diff --git a/src/main/NGECore.java b/src/main/NGECore.java
index 07194a52..45db8dd8 100644
--- a/src/main/NGECore.java
+++ b/src/main/NGECore.java
@@ -52,7 +52,7 @@ import net.engio.mbassy.bus.config.BusConfiguration;
 import resources.common.BountyListItem;
 import resources.common.RadialOptions;
 import resources.common.ThreadMonitor;
-import resources.datatables.ServerStatus;
+import resources.datatables.GalaxyStatus;
 import resources.objects.creature.CreatureObject;
 import resources.objects.guild.GuildObject;
 import resources.objects.resource.GalacticResource;
@@ -305,7 +305,7 @@ public class NGECore {
 			databaseConnection2.connect(config.getString("DB2.URL"), config.getString("DB2.NAME"), config.getString("DB2.USER"), config.getString("DB2.PASS"), "mysql");
 		}
 		
-		setGalaxyStatus(ServerStatus.Loading);
+		setGalaxyStatus(GalaxyStatus.Loading);
 		swgObjectODB = new ObjectDatabase("swgobjects", true, true, true, SWGObject.class);
 		mailODB = new ObjectDatabase("mails", true, true, true, Mail.class);
 		guildODB = new ObjectDatabase("guild", true, true, true, GuildObject.class);
@@ -571,7 +571,7 @@ public class NGECore {
 		didServerCrash = false;
 		System.out.println("Started Server.");
 		cleanupCreatureODB();
-		setGalaxyStatus(ServerStatus.Online);
+		setGalaxyStatus(GalaxyStatus.Online);
 		
 	}
 
@@ -792,7 +792,7 @@ public class NGECore {
 					chatService.broadcastGalaxy("The server will be shutting down soon. Please find a safe place to logout. (" + minutes + " minutes left)");
 					Thread.sleep(60000);
 			}
-			setGalaxyStatus(ServerStatus.Locked);
+			setGalaxyStatus(GalaxyStatus.Locked);
 			chatService.broadcastGalaxy("The server will be shutting down soon. Please find a safe place to logout. (" + 1 + " minutes left)");
 			Thread.sleep(30000);
 			chatService.broadcastGalaxy("You will be disconnected in 30 seconds so the server can perform a final save before shutting down.  Please find a safe place to logout now.");
diff --git a/src/resources/datatables/ServerStatus.java b/src/resources/datatables/GalaxyStatus.java
similarity index 97%
rename from src/resources/datatables/ServerStatus.java
rename to src/resources/datatables/GalaxyStatus.java
index a825d2e8..86669e89 100644
--- a/src/resources/datatables/ServerStatus.java
+++ b/src/resources/datatables/GalaxyStatus.java
@@ -21,7 +21,7 @@
  ******************************************************************************/
 package resources.datatables;
 
-public class ServerStatus {
+public class GalaxyStatus {
 	
 	public static final int Offline = 0;
 	public static final int Loading = 1;