pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-26 15:37:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Commands] Cleanup #zonebootup and #zoneshutdown Commands (#3729)

Browse Source 
# Notes
- Cleanup messages and logic.
This commit is contained in:
Alex King
2023-12-03 12:40:54 -05:00
committed by GitHub
parent e719aa43cf
commit 11a81d8e8a
6 changed files with 123 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/gm_commands/zonebootup.cpp
+38 -16
View File
@@ -5,21 +5,43 @@ extern WorldServer worldserver;
void command_zonebootup(Client *c, const Seperator *sep)
{
if (!worldserver.Connected()) {
c->Message(Chat::White, "Error: World server disconnected");
const int arguments = sep->argnum;
if (arguments < 2 || !sep->IsNumber(1)) {
c->Message(Chat::White, "Usage: #zonebootup [Zone Server ID] [Zone ID|Zone Short Name] [Instance ID]");
return;
}
else if (sep->arg[2][0] == 0) {
c->Message(Chat::White, "Usage: #zonebootup ZoneServerID# zoneshortname");
}
else {
auto pack = new ServerPacket(ServerOP_ZoneBootup, sizeof(ServerZoneStateChange_struct));
ServerZoneStateChange_struct *s = (ServerZoneStateChange_struct *) pack->pBuffer;
s->ZoneServerID = Strings::ToInt(sep->arg[1]);
strcpy(s->adminname, c->GetName());
s->zoneid = ZoneID(sep->arg[2]);
s->makestatic = (bool) (strcasecmp(sep->arg[3], "static") == 0);
worldserver.SendPacket(pack);
safe_delete(pack);
}
}
if (!worldserver.Connected()) {
c->Message(Chat::White, "World server disconnected.");
return;
}
const uint32 zone_server_id = Strings::ToUnsignedInt(sep->arg[1]);
const uint32 zone_id = Strings::IsNumber(sep->arg[2]) ? Strings::ToUnsignedInt(sep->arg[2]) : ZoneID(sep->arg[2]);
const bool is_static = arguments > 2 ? !strcasecmp(sep->arg[3], "static") : false;
const uint16 instance_id = arguments > 3 ? static_cast<uint16>(Strings::ToUnsignedInt(sep->arg[4])) : 0;
if (!zone_id) {
c->Message(
Chat::White,
fmt::format(
"Zone '{}' does not exist.",
sep->arg[1]
).c_str()
);
return;
}
auto pack = new ServerPacket(ServerOP_ZoneBootup, sizeof(ServerZoneStateChange_Struct));
auto *s = (ServerZoneStateChange_Struct *) pack->pBuffer;
s->zone_server_id = zone_server_id;
s->zone_id = zone_id;
s->instance_id = instance_id;
s->is_static = is_static;
strn0cpy(s->admin_name, c->GetName(), sizeof(s->admin_name));
worldserver.SendPacket(pack);
safe_delete(pack);
}
zone/gm_commands/zoneshutdown.cpp
+32 -21
View File
@@ -5,26 +5,37 @@ extern WorldServer worldserver;
void command_zoneshutdown(Client *c, const Seperator *sep)
{
if (!worldserver.Connected()) {
c->Message(Chat::White, "Error: World server disconnected");
const int arguments = sep->argnum;
if (!arguments) {
c->Message(Chat::White, "Usage: #zoneshutdown [Zone ID|Zone Short Name]");
return;
}
else if (sep->arg[1][0] == 0) {
c->Message(Chat::White, "Usage: #zoneshutdown zoneshortname");
}
else {
auto pack = new ServerPacket(
ServerOP_ZoneShutdown,
sizeof(ServerZoneStateChange_struct));
ServerZoneStateChange_struct *s = (ServerZoneStateChange_struct *) pack->pBuffer;
strcpy(s->adminname, c->GetName());
if (sep->arg[1][0] >= '0' && sep->arg[1][0] <= '9') {
s->ZoneServerID = Strings::ToInt(sep->arg[1]);
}
else {
s->zoneid = ZoneID(sep->arg[1]);
}
worldserver.SendPacket(pack);
safe_delete(pack);
}
}
if (!worldserver.Connected()) {
c->Message(Chat::White, "World server disconnected.");
return;
}
const uint32 zone_id = sep->IsNumber(1) ? Strings::ToUnsignedInt(sep->arg[1]) : ZoneID(sep->arg[1]);
if (!zone_id) {
c->Message(
Chat::White,
fmt::format(
"Zone '{}' does not exist.",
sep->arg[1]
).c_str()
);
return;
}
auto pack = new ServerPacket(ServerOP_ZoneShutdown, sizeof(ServerZoneStateChange_Struct));
auto *s = (ServerZoneStateChange_Struct *) pack->pBuffer;
s->zone_id = zone_id;
strn0cpy(s->admin_name, c->GetName(), sizeof(s->admin_name));
worldserver.SendPacket(pack);
safe_delete(pack);
}