AstralTransRocketries/MCGalaxy
1
0
Fork 0
mirror of https://github.com/ClassiCube/MCGalaxy.git synced 2025-09-24 05:03:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove /server shutdown/restart/update since you should just use those commands anyways.

Browse Source
This commit is contained in:
UnknownShadow200 2016-06-30 10:21:58 +10:00
parent dcc1e2462c
commit 6934c4bcca
2 changed files with 13 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Commands/building/CmdPortal.cs
View File

@ -49,7 +49,6 @@ namespace MCGalaxy.Commands.Building {
else if (block == "water") { data.type = Block.water_portal; }
else if (block == "lava") { data.type = Block.lava_portal; }
else if (block == "show") { ShowPortals(p); return; }
else if (block == "list") { ListPortals(p); return; }
else { Help(p); return; }
Player.Message(p, "Place an &aEntry block %Sfor the portal");
@ -109,8 +108,7 @@ namespace MCGalaxy.Commands.Building {
}
Player.Message(p, "&3Exit %Sblock placed");
if (!p.staticCommands)
return;
if (!p.staticCommands) return;
bp.entries.Clear();
p.blockchangeObject = bp;
p.Blockchange += EntryChange;
@ -143,18 +141,6 @@ namespace MCGalaxy.Commands.Building {
Portals.Dispose();
}
void ListPortals(Player p) {
//safe against SQL injections because no user input is given here
DataTable Portals = Database.fillData("SELECT * FROM `Portals" + p.level.name + "`");
const string format = "({0},{1},{2}) to ({3},{4},{5}) on {6}";
foreach (DataRow row in Portals.Rows) {
Player.Message(p, format, U16(row["EntryX"]), U16(row["EntryY"]), U16(row["EntryZ"]),
U16(row["ExitX"]), U16(row["ExitY"]), U16(row["ExitZ"]), row["ExitMap"]);
}
Player.Message(p, "{0} portals in total.", Portals.Rows.Count);
Portals.Dispose();
}
static ushort U16(object x) { return Convert.ToUInt16(x); }
public override void Help(Player p) {

39
Commands/other/CmdServer.cs
View File

@ -21,10 +21,9 @@ using System.IO;
using System.IO.Packaging;
using System.Threading;
using MCGalaxy.SQL;
namespace MCGalaxy.Commands
{
public sealed class CmdServer : Command
{
namespace MCGalaxy.Commands {
public sealed class CmdServer : Command {
public override string name { get { return "server"; } }
public override string shortcut { get { return "serv"; } }
public override string type { get { return CommandTypes.Other; } }
@ -32,15 +31,8 @@ namespace MCGalaxy.Commands
public override LevelPermission defaultRank { get { return LevelPermission.Admin; } }
public CmdServer() { }
public override void Use(Player p, string message)
{
switch (message)
{
case "restart":
case "update":
case "shutdown":
Command.all.Find(message).Use(p, ""); //Will use other options later.
break;
public override void Use(Player p, string message) {
switch (message) {
case "public":
Server.pub = true;
Player.Message(p, "Server is now public!");
@ -90,7 +82,7 @@ namespace MCGalaxy.Commands
// When backing up, one option is to save all non-main program files.
// This means all folders, and files in these folders.
Player.Message(p, "Server backup (Everything): Started. Please wait while backup finishes.");
Save(true, p);
Save(true, true, p);
break;
case "backup db":
// Backup database only.
@ -107,7 +99,7 @@ namespace MCGalaxy.Commands
// When backing up, one option is to save all non-main program files.
// This means all folders, and files in these folders.
Player.Message(p, "Server backup (Everything but Database): Started. Please wait while backup finishes.");
Save(false, p);
Save(true, false, p);
break;
case "restore":
if (!CheckPerms(p)) {
@ -131,11 +123,8 @@ namespace MCGalaxy.Commands
if (Server.server_owner.CaselessEq("Notch")) return false;
return p.name.CaselessEq(Server.server_owner);
}
private void Save(bool withDB, Player p) { Save(true, withDB, p); }
private void Save(bool withFiles, bool withDB, Player p)
{
void Save(bool withFiles, bool withDB, Player p) {
ParameterizedThreadStart pts = new ParameterizedThreadStart(CreatePackage);
Thread doWork = new Thread(new ParameterizedThreadStart(CreatePackage));
doWork.Name = "MCG_SaveServer";
@ -174,14 +163,10 @@ namespace MCGalaxy.Commands
Server.restarting = false;
}
public override void Help(Player p)
{
Player.Message(p, "/server <reset|restart|reload|update|shutdown|public|private|backup|restore> - All server commands.");
public override void Help(Player p) {
Player.Message(p, "/server <reset|reload|public|private|backup|restore> - All server commands.");
Player.Message(p, "/server <reset> - Reset everything to defaults. (Owner only) WARNING: This will erase ALL properties. Use with caution. (Likely requires restart)");
Player.Message(p, "/server <restart> - Restart the server.");
Player.Message(p, "/server <reload> - Reload the server files. (May require restart) (Owner only)");
Player.Message(p, "/server <update> - Update the server");
Player.Message(p, "/server <shutdown> - Shutdown the server");
Player.Message(p, "/server <public> - Make the server public. (Start listening for new connections.)");
Player.Message(p, "/server <private> - Make the server private. (Stop listening for new connections.)");
Player.Message(p, "/server <restore> - Restore the server from a backup.");
@ -192,7 +177,7 @@ namespace MCGalaxy.Commands
Player.Message(p, "allbutdb - Backup everything BUT the database.");
}
private static void CreatePackage(object par)
static void CreatePackage(object par)
{
List<object> param = (List<object>)par;
CreatePackage((string)param[0], (bool)param[1], (bool)param[2], (Player)param[3]);
@ -202,7 +187,7 @@ namespace MCGalaxy.Commands
/// <summary>
/// Creates a package zip file containing specified
/// content and resource files.</summary>
private static void CreatePackage(string packagePath, bool withFiles, bool withDB, Player p)
static void CreatePackage(string packagePath, bool withFiles, bool withDB, Player p)
{
// Create the Package