[Commands] Consolidate #lock and #unlock Commands into #serverlock. (#2193)

- Convert the two commands into one command.
- Cleanup struct naming.

zone/command.cpp

@@ -229,7 +229,6 @@ int command_init(void)
 		command_add("listpetition", "- List petitions", AccountStatus::Guide, command_listpetition) ||
 		command_add("load_shared_memory", "[shared_memory_name] - Reloads shared memory and uses the input as output", AccountStatus::GMImpossible, command_load_shared_memory) ||
 		command_add("loc", "- Print out your or your target's current location and heading", AccountStatus::Player, command_loc) ||
-		command_add("lock", "- Lock the worldserver", AccountStatus::GMLeadAdmin, command_lock) ||
 		command_add("logs",  "Manage anything to do with logs", AccountStatus::GMImpossible, command_logs) ||
 		command_add("makepet", "[Pet Name] - Make a pet", AccountStatus::Guide, command_makepet) ||
 		command_add("mana", "- Fill your or your target's mana", AccountStatus::Guide, command_mana) ||
@@ -299,6 +298,7 @@ int command_init(void)
 		command_add("sendzonespawns", "- Refresh spawn list for all clients in zone", AccountStatus::GMLeadAdmin, command_sendzonespawns) ||
 		command_add("sensetrap",  "Analog for ldon sense trap for the newer clients since we still don't have it working.", AccountStatus::Player, command_sensetrap) ||
 		command_add("serverinfo", "- Get CPU, Operating System, and Process Information about the server", AccountStatus::GMMgmt, command_serverinfo) ||
+		command_add("serverlock", "[0|1] - Lock or Unlock the World Server (0 = Unlocked, 1 = Locked)", AccountStatus::GMLeadAdmin, command_serverlock) ||
 		command_add("serverrules", "- Read this server's rules", AccountStatus::Player, command_serverrules) ||
 		command_add("setaapts", "[AA|Group|Raid] [AA Amount] - Set your or your player target's Available AA Points by Type", AccountStatus::GMAdmin, command_setaapts) ||
 		command_add("setaaxp", "[AA|Group|Raid] [AA Experience] - Set your or your player target's AA Experience by Type", AccountStatus::GMAdmin, command_setaaxp) ||
@@ -355,7 +355,6 @@ int command_init(void)
 		command_add("undye", "- Remove dye from all of your or your target's armor slots", AccountStatus::GMAdmin, command_undye) ||
 		command_add("undyeme", "- Remove dye from all of your armor slots", AccountStatus::Player, command_undyeme) ||
 		command_add("unfreeze", "- Unfreeze your target", AccountStatus::QuestTroupe, command_unfreeze) ||
-		command_add("unlock", "- Unlock the worldserver", AccountStatus::GMLeadAdmin, command_unlock) ||
 		command_add("unmemspell", "[Spell ID] - Unmemorize a Spell by ID for you or your target", AccountStatus::Guide, command_unmemspell) ||
 		command_add("unmemspells", " - Unmemorize all spells for you or your target", AccountStatus::Guide, command_unmemspells) ||
 		command_add("unscribespell", "[Spell ID] - Unscribe a spell from your or your target's spell book by Spell ID", AccountStatus::GMCoder, command_unscribespell) ||
@@ -1242,7 +1241,6 @@ void command_bot(Client *c, const Seperator *sep)
 #include "gm_commands/list.cpp"
 #include "gm_commands/listpetition.cpp"
 #include "gm_commands/loc.cpp"
-#include "gm_commands/lock.cpp"
 #include "gm_commands/logcommand.cpp"
 #include "gm_commands/logs.cpp"
 #include "gm_commands/makepet.cpp"
@@ -1314,6 +1312,7 @@ void command_bot(Client *c, const Seperator *sep)
 #include "gm_commands/sendzonespawns.cpp"
 #include "gm_commands/sensetrap.cpp"
 #include "gm_commands/serverinfo.cpp"
+#include "gm_commands/serverlock.cpp"
 #include "gm_commands/serverrules.cpp"
 #include "gm_commands/set_adventure_points.cpp"
 #include "gm_commands/setaapts.cpp"
@@ -1368,7 +1367,6 @@ void command_bot(Client *c, const Seperator *sep)
 #include "gm_commands/undye.cpp"
 #include "gm_commands/undyeme.cpp"
 #include "gm_commands/unfreeze.cpp"
-#include "gm_commands/unlock.cpp"
 #include "gm_commands/unmemspell.cpp"
 #include "gm_commands/unmemspells.cpp"
 #include "gm_commands/unscribespell.cpp"