mirror of
https://github.com/ProjectSWGCore/NGECore2.git
synced 2026-08-27 17:57:22 -04:00
Changed ServerStatus to GalaxyStatus
In-game "servers" are refered to as galaxies - not servers. The datatable has been renamed to reflect that.
This commit is contained in:
@@ -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':
|
||||
|
||||
@@ -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.");
|
||||
|
||||
+1
-1
@@ -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;
|
||||
Reference in New Issue
Block a user