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

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

Browse Source 
* [Commands] Cleanup #cvs Command.
- Cleanup messages and logic.
- std::find was using .begin() in both comparisons, so it wasn't working and unique IPS always returned 1.

* Update cvs.cpp
This commit is contained in:
Kinglykrab 2022-05-07 23:45:44 -04:00 committed by GitHub
parent f201d4c999
commit b27428a6d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 85 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
world/clientlist.cpp
View File

@ -1380,7 +1380,7 @@ void ClientList::SendClientVersionSummary(const char *Name)
LinkedListIterator<ClientListEntry*> Iterator(clientlist); LinkedListIterator<ClientListEntry*> Iterator(clientlist);
Iterator.Reset(); Iterator.Reset();
while (Iterator.MoreElements()) { while (Iterator.MoreElements()) {
ClientListEntry* CLE = Iterator.GetData(); auto CLE = Iterator.GetData();
if (CLE && CLE->zone()) { if (CLE && CLE->zone()) {
auto client_version = CLE->GetClientVersion(); auto client_version = CLE->GetClientVersion();
if ( if (
@ -1390,7 +1390,7 @@ void ClientList::SendClientVersionSummary(const char *Name)
client_count[(EQ::versions::ClientVersion)client_version]++; client_count[(EQ::versions::ClientVersion)client_version]++;
} }
if (std::find(unique_ips.begin(), unique_ips.begin(), CLE->GetIP()) == unique_ips.end()) { if (std::find(unique_ips.begin(), unique_ips.end(), CLE->GetIP()) == unique_ips.end()) {
unique_ips.push_back(CLE->GetIP()); unique_ips.push_back(CLE->GetIP());
} }
} }
@ -1407,27 +1407,97 @@ void ClientList::SendClientVersionSummary(const char *Name)
client_count[EQ::versions::ClientVersion::RoF2] client_count[EQ::versions::ClientVersion::RoF2]
); );
if (client_count[EQ::versions::ClientVersion::Titanium]) {
zoneserver_list.SendEmoteMessage(
Name,
0,
AccountStatus::Player,
Chat::White,
fmt::format(
"Client Counts | Titanium: {}",
client_count[EQ::versions::ClientVersion::Titanium]
).c_str()
);
}
if (client_count[EQ::versions::ClientVersion::SoF]) {
zoneserver_list.SendEmoteMessage(
Name,
0,
AccountStatus::Player,
Chat::White,
fmt::format(
"Client Counts | SOF: {}",
client_count[EQ::versions::ClientVersion::SoF]
).c_str()
);
}
if (client_count[EQ::versions::ClientVersion::SoD]) {
zoneserver_list.SendEmoteMessage(
Name,
0,
AccountStatus::Player,
Chat::White,
fmt::format(
"Client Counts | SOD: {}",
client_count[EQ::versions::ClientVersion::SoD]
).c_str()
);
}
if (client_count[EQ::versions::ClientVersion::UF]) {
zoneserver_list.SendEmoteMessage(
Name,
0,
AccountStatus::Player,
Chat::White,
fmt::format(
"Client Counts | UF: {}",
client_count[EQ::versions::ClientVersion::UF]
).c_str()
);
}
if (client_count[EQ::versions::ClientVersion::RoF]) {
zoneserver_list.SendEmoteMessage(
Name,
0,
AccountStatus::Player,
Chat::White,
fmt::format(
"Client Counts | ROF: {}",
client_count[EQ::versions::ClientVersion::RoF]
).c_str()
);
}
if (client_count[EQ::versions::ClientVersion::RoF2]) {
zoneserver_list.SendEmoteMessage(
Name,
0,
AccountStatus::Player,
Chat::White,
fmt::format(
"Client Counts | ROF2: {}",
client_count[EQ::versions::ClientVersion::RoF2]
).c_str()
);
}
zoneserver_list.SendEmoteMessage( zoneserver_list.SendEmoteMessage(
Name, Name,
0, 0,
AccountStatus::Player, AccountStatus::Player,
Chat::White, Chat::White,
fmt::format( fmt::format(
"There {} {} Titanium, {} SoF, {} SoD, {} UF, {} RoF, and {} RoF2 Client{} currently connected for a total of {} Client{} and {} Unique IP{} connected.", "Client Counts | Total: {} Unique IPs: {}",
(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,
(total_clients != 1 ? "s" : ""), unique_ips.size()
unique_ips.size(),
(unique_ips.size() != 1 ? "s" : "")
).c_str() ).c_str()
); );
} }
void ClientList::OnTick(EQ::Timer *t) void ClientList::OnTick(EQ::Timer *t)

5
zone/gm_commands/cvs.cpp
View File

@ -5,10 +5,7 @@ extern WorldServer worldserver;
void command_cvs(Client *c, const Seperator *sep) void command_cvs(Client *c, const Seperator *sep)
{ {
auto pack = new ServerPacket( auto pack = new ServerPacket(ServerOP_ClientVersionSummary, sizeof(ServerRequestClientVersionSummary_Struct));
ServerOP_ClientVersionSummary,
sizeof(ServerRequestClientVersionSummary_Struct)
);
auto srcvss = (ServerRequestClientVersionSummary_Struct *) pack->pBuffer; auto srcvss = (ServerRequestClientVersionSummary_Struct *) pack->pBuffer;
strn0cpy(srcvss->Name, c->GetName(), sizeof(srcvss->Name)); strn0cpy(srcvss->Name, c->GetName(), sizeof(srcvss->Name));
worldserver.SendPacket(pack); worldserver.SendPacket(pack);