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

[Commands] Cleanup #reloadaa Command. (#2120)

Browse Source 
* [Commands] Cleanup #reloadaa Command.
- Cleanup messages.
- Remove unncessary file_exists command from file.
- Make reloading of Alternate Advancement data global instead of zone specific.

* Update worldserver.cpp

* Update worldserver.cpp
This commit is contained in:
Kinglykrab 2022-05-06 21:57:19 -04:00 committed by GitHub
parent bf1d05d639
commit 86568e9292
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 42 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/servertalk.h
View File

@ -229,6 +229,7 @@
#define ServerOP_ReloadContentFlags 0x4013
#define ServerOP_ReloadVariablesWorld 0x4014
#define ServerOP_ReloadMerchants 0x4016
#define ServerOP_ReloadAAData 0x4017
#define ServerOP_ReloadStaticZoneData 0x4020
#define ServerOP_CZDialogueWindow 0x4500

5
world/zoneserver.cpp
View File

@ -889,6 +889,11 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
zoneserver_list.SendPacket(pack);
break;
}
case ServerOP_ReloadAAData:
{
zoneserver_list.SendPacket(pack);
break;
}
case ServerOP_ReloadMerchants:
{
zoneserver_list.SendPacket(pack);

2
zone/command.cpp
View File

@ -285,7 +285,7 @@ int command_init(void)
command_add("raidloot", "[All|GroupLeader|RaidLeader|Selected] - Sets your Raid Loot Type if you have permission to do so.", AccountStatus::Player, command_raidloot) ||
command_add("randomfeatures", "- Temporarily randomizes the Facial Features of your target", AccountStatus::QuestTroupe, command_randomfeatures) ||
command_add("refreshgroup", "- Refreshes Group for you or your player target.", AccountStatus::Player, command_refreshgroup) ||
command_add("reloadaa", "Reloads AA data", AccountStatus::GMMgmt, command_reloadaa) ||
command_add("reloadaa", "Reloads Alternate Advancement data globally", AccountStatus::GMMgmt, command_reloadaa) ||
command_add("reloadallrules", "Executes a reload of all rules globally.", AccountStatus::QuestTroupe, command_reloadallrules) ||
command_add("reloadcontentflags", "Executes a reload of all expansion and content flags", AccountStatus::QuestTroupe, command_reloadcontentflags) ||
command_add("reloademote", "Reloads NPC Emotes", AccountStatus::QuestTroupe, command_reloademote) ||

2
zone/entity.cpp
View File

@ -5601,7 +5601,7 @@ void EntityList::StopMobAI()
}
void EntityList::SendAlternateAdvancementStats() {
for(auto &c : client_list) {
for (auto &c : client_list) {
c.second->SendClearPlayerAA();
c.second->SendAlternateAdvancementTable();
c.second->SendAlternateAdvancementStats();

14
zone/gm_commands/reloadaa.cpp
View File

@ -3,15 +3,9 @@
void command_reloadaa(Client *c, const Seperator *sep)
{
c->Message(Chat::White, "Reloading Alternate Advancement Data...");
zone->LoadAlternateAdvancement();
c->Message(Chat::White, "Alternate Advancement Data Reloaded");
entity_list.SendAlternateAdvancementStats();
}
inline bool file_exists(const std::string &name)
{
std::ifstream f(name.c_str());
return f.good();
c->Message(Chat::White, "Attempted to reload Alternate Advancement data globally.");
auto pack = new ServerPacket(ServerOP_ReloadAAData, 0);
worldserver.SendPacket(pack);
safe_delete(pack);
}

32
zone/worldserver.cpp
View File

@ -2021,7 +2021,7 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
AccountStatus::GMAdmin,
Chat::Yellow,
fmt::format(
"Content flags (and expansion) reloaded for {}.",
"Content flags (and expansion) reloaded for {}{}.",
fmt::format(
"{} ({})",
zone->GetLongName(),
@ -2030,7 +2030,7 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
(
zone->GetInstanceID() ?
fmt::format(
"Instance ID: {}",
" (Instance ID {})",
zone->GetInstanceID()
) :
""
@ -2073,7 +2073,35 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
parse->LoadPerlEventExportSettings(parse->perl_event_export_settings);
break;
}
case ServerOP_ReloadAAData: {
if (zone) {
worldserver.SendEmoteMessage(
0,
0,
AccountStatus::GMAdmin,
Chat::Yellow,
fmt::format(
"Alternate Advancement data reloaded for {}{}.",
fmt::format(
"{} ({})",
zone->GetLongName(),
zone->GetZoneID()
),
(
zone->GetInstanceID() ?
fmt::format(
" (Instance ID {})",
zone->GetInstanceID()
) :
""
)
).c_str()
);
zone->LoadAlternateAdvancement();
}
break;
}
case ServerOP_ReloadMerchants: {
if (zone) {
worldserver.SendEmoteMessage(