pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-11 21:01:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Commands] Add Instance Support to #zoneshutdown (#4807)

Browse Source 
* [Commands] Add Instance Support to #zoneshutdown

* Update zoneserver.cpp

* Update zoneshutdown.cpp
This commit is contained in:
Alex King 2025-03-29 15:44:08 -04:00 committed by GitHub
parent 49664cc1a0
commit b040571427
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 59 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
world/zoneserver.cpp
View File

@ -729,13 +729,15 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
zs = zoneserver_list.FindByID(s->zone_server_id);
} else if (s->zone_id) {
zs = zoneserver_list.FindByName(ZoneName(s->zone_id));
} else if (s->instance_id) {
zs = zoneserver_list.FindByInstanceID(s->instance_id);
} else {
zoneserver_list.SendEmoteMessage(
s->admin_name,
0,
AccountStatus::Player,
Chat::White,
"Error: SOP_ZoneShutdown: neither ID nor name specified"
"Error: SOP_ZoneShutdown: Zone ID, Instance ID, nor Zone Short Name specified"
);
}

2
zone/command.cpp
View File

@ -245,7 +245,7 @@ int command_init(void)
command_add("zonebootup", "[ZoneServerID] [shortname] - Make a zone server boot a specific zone", AccountStatus::GMLeadAdmin, command_zonebootup) ||
command_add("zoneinstance", "[Instance ID] [X] [Y] [Z] - Teleport to specified Instance by ID (coordinates are optional)", AccountStatus::Guide, command_zone_instance) ||
command_add("zoneshard", "[zone] [instance_id] - Teleport explicitly to a zone shard", AccountStatus::Player, command_zone_shard) ||
command_add("zoneshutdown", "[shortname] - Shut down a zone server", AccountStatus::GMLeadAdmin, command_zoneshutdown) ||
command_add("zoneshutdown", "[instance|zone] [Instance ID|Zone ID|Zone Short Name] - Shut down a zone server by Instance ID, Zone ID, or Zone Short Name", AccountStatus::GMLeadAdmin, command_zoneshutdown) ||
command_add("zsave", " Saves zheader to the database", AccountStatus::QuestTroupe, command_zsave)
) {
command_deinit();

48
zone/gm_commands/zoneshutdown.cpp
View File

@ -6,8 +6,18 @@ extern WorldServer worldserver;
void command_zoneshutdown(Client *c, const Seperator *sep)
{
const int arguments = sep->argnum;
if (!arguments) {
c->Message(Chat::White, "Usage: #zoneshutdown [Zone ID|Zone Short Name]");
if (arguments < 2) {
c->Message(Chat::White, "Usage: #zoneshutdown instance [Instance ID]");
c->Message(Chat::White, "Usage: #zoneshutdown zone [Zone ID|Zone Short Name]");
return;
}
bool is_instance = !strcasecmp(sep->arg[1], "instance");
bool is_zone = !strcasecmp(sep->arg[1], "zone");
if (!is_instance && !is_zone) {
c->Message(Chat::White, "Usage: #zoneshutdown instance [Instance ID]");
c->Message(Chat::White, "Usage: #zoneshutdown zone [Zone ID|Zone Short Name]");
return;
}
@ -16,7 +26,27 @@ void command_zoneshutdown(Client *c, const Seperator *sep)
return;
}
const uint32 zone_id = sep->IsNumber(1) ? Strings::ToUnsignedInt(sep->arg[1]) : ZoneID(sep->arg[1]);
uint32 zone_id = 0;
uint16 instance_id = 0;
std::string message = "";
if (is_instance) {
instance_id = sep->IsNumber(2) ? Strings::ToUnsignedInt(sep->arg[2]) : 0;
if (!database.CheckInstanceExists(instance_id)) {
c->Message(
Chat::White,
fmt::format(
"Instance ID '{}' does not exist.",
instance_id
).c_str()
);
return;
}
message = fmt::format("Instance ID {}", instance_id);
} else if (is_zone) {
zone_id = sep->IsNumber(2) ? Strings::ToUnsignedInt(sep->arg[2]) : ZoneID(sep->arg[2]);
if (!zone_id) {
c->Message(
@ -29,10 +59,22 @@ void command_zoneshutdown(Client *c, const Seperator *sep)
return;
}
message = fmt::format("{} (ID {})", ZoneLongName(zone_id), zone_id);
}
c->Message(
Chat::White,
fmt::format(
"Attempting to shut down {}.",
message
).c_str()
);
auto pack = new ServerPacket(ServerOP_ZoneShutdown, sizeof(ServerZoneStateChange_Struct));
auto *s = (ServerZoneStateChange_Struct *) pack->pBuffer;
s->zone_id = zone_id;
s->instance_id = instance_id;
strn0cpy(s->admin_name, c->GetName(), sizeof(s->admin_name));