pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-19 20:41:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Commands] Cleanup #cvs Command. (#1709)

Browse Source 
* [Commands] Cleanup #cvs Command.
- Cleanup message and display.
- Add Total Clients to message.
- Add Unique IPs to message.

* Formatting.

* Formatting.
This commit is contained in:
Kinglykrab 2021-11-11 16:48:50 -05:00 committed by GitHub
parent 994ef712b2
commit fa07064466
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 58 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
world/clientlist.cpp
View File

@ -1343,71 +1343,67 @@ void ClientList::GetClients(const char *zone_name, std::vector<ClientListEntry *
void ClientList::SendClientVersionSummary(const char *Name) void ClientList::SendClientVersionSummary(const char *Name)
{ {
uint32 ClientTitaniumCount = 0; std::vector<uint32> unique_ips;
uint32 ClientSoFCount = 0; std::map<EQ::versions::ClientVersion,int> client_count = {
uint32 ClientSoDCount = 0; { EQ::versions::ClientVersion::Titanium, 0 },
uint32 ClientUnderfootCount = 0; { EQ::versions::ClientVersion::SoF, 0 },
uint32 ClientRoFCount = 0; { EQ::versions::ClientVersion::SoD, 0 },
uint32 ClientRoF2Count = 0; { EQ::versions::ClientVersion::UF, 0 },
{ EQ::versions::ClientVersion::RoF, 0 },
{ EQ::versions::ClientVersion::RoF2, 0 }
};
LinkedListIterator<ClientListEntry*> Iterator(clientlist); LinkedListIterator<ClientListEntry*> Iterator(clientlist);
Iterator.Reset(); Iterator.Reset();
while (Iterator.MoreElements()) {
while(Iterator.MoreElements())
{
ClientListEntry* CLE = Iterator.GetData(); ClientListEntry* CLE = Iterator.GetData();
if (CLE && CLE->zone()) {
auto client_version = CLE->GetClientVersion();
if (
client_version >= (uint8) EQ::versions::ClientVersion::Titanium &&
client_version <= (uint8) EQ::versions::ClientVersion::RoF2
) {
client_count[(EQ::versions::ClientVersion)client_version]++;
}
if(CLE && CLE->zone()) if (std::find(unique_ips.begin(), unique_ips.begin(), CLE->GetIP()) == unique_ips.end()) {
{ unique_ips.push_back(CLE->GetIP());
switch(CLE->GetClientVersion())
{
case 1:
{
break;
}
case 2:
{
++ClientTitaniumCount;
break;
}
case 3:
{
++ClientSoFCount;
break;
}
case 4:
{
++ClientSoDCount;
break;
}
case 5:
{
++ClientUnderfootCount;
break;
}
case 6:
{
++ClientRoFCount;
break;
}
case 7:
{
++ClientRoF2Count;
break;
}
default:
break;
} }
} }
Iterator.Advance(); Iterator.Advance();
} }
zoneserver_list.SendEmoteMessage(Name, 0, 0, 13, "There are %i Titanium, %i SoF, %i SoD, %i UF, %i RoF, %i RoF2 clients currently connected.", uint32 total_clients = (
ClientTitaniumCount, ClientSoFCount, ClientSoDCount, ClientUnderfootCount, ClientRoFCount, ClientRoF2Count); client_count[EQ::versions::ClientVersion::Titanium] +
client_count[EQ::versions::ClientVersion::SoF] +
client_count[EQ::versions::ClientVersion::SoD] +
client_count[EQ::versions::ClientVersion::UF] +
client_count[EQ::versions::ClientVersion::RoF] +
client_count[EQ::versions::ClientVersion::RoF2]
);
zoneserver_list.SendEmoteMessage(
Name,
0,
0,
Chat::White,
fmt::format(
"There {} {} Titanium, {} SoF, {} SoD, {} UF, {} RoF, and {} RoF2 Client{} currently connected for a total of {} Client{} and {} Unique IP{} connected.",
(total_clients != 1 ? "are" : "is"),
client_count[EQ::versions::ClientVersion::Titanium],
client_count[EQ::versions::ClientVersion::SoF],
client_count[EQ::versions::ClientVersion::SoD],
client_count[EQ::versions::ClientVersion::UF],
client_count[EQ::versions::ClientVersion::RoF],
client_count[EQ::versions::ClientVersion::RoF2],
(total_clients != 1 ? "s" : ""),
total_clients,
(total_clients != 1 ? "s" : ""),
unique_ips.size(),
(unique_ips.size() != 1 ? "s" : "")
).c_str()
);
} }
void ClientList::OnTick(EQ::Timer *t) void ClientList::OnTick(EQ::Timer *t)

22
zone/command.cpp
View File

@ -13778,20 +13778,14 @@ void command_door(Client *c, const Seperator *sep) {
void command_cvs(Client *c, const Seperator *sep) void command_cvs(Client *c, const Seperator *sep)
{ {
if(c) auto pack = new ServerPacket(
{ ServerOP_ClientVersionSummary,
auto pack = sizeof(ServerRequestClientVersionSummary_Struct)
new ServerPacket(ServerOP_ClientVersionSummary, sizeof(ServerRequestClientVersionSummary_Struct)); );
auto srcvss = (ServerRequestClientVersionSummary_Struct*)pack->pBuffer;
ServerRequestClientVersionSummary_Struct *srcvss = (ServerRequestClientVersionSummary_Struct*)pack->pBuffer; strn0cpy(srcvss->Name, c->GetName(), sizeof(srcvss->Name));
worldserver.SendPacket(pack);
strn0cpy(srcvss->Name, c->GetName(), sizeof(srcvss->Name)); safe_delete(pack);
worldserver.SendPacket(pack);
safe_delete(pack);
}
} }
void command_max_all_skills(Client *c, const Seperator *sep) void command_max_all_skills(Client *c, const Seperator *sep)