From 1d59fff2bf9e113b0c100575fcaf566b31371b6e Mon Sep 17 00:00:00 2001
From: Kinglykrab <89047260+Kinglykrab@users.noreply.github.com>
Date: Fri, 6 May 2022 20:22:58 -0400
Subject: [PATCH] [Commands] Cleanup #reloadperlexportsettings Command. (#2124)

* [Commands] Cleanup #reloadperlexportsettings Command.
- Cleanup messages and logic.
- Make reloading of Perl event export settings global instead of zone specific.

* Update worldserver.cpp
---
 zone/command.cpp                              |  2 +-
 zone/gm_commands/reloadperlexportsettings.cpp | 11 ++++-----
 zone/worldserver.cpp                          | 24 +++++++++++++++++++
 3 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/zone/command.cpp b/zone/command.cpp
index 50e765885..15b8760bd 100755
--- a/zone/command.cpp
+++ b/zone/command.cpp
@@ -293,7 +293,7 @@ int command_init(void)
 		command_add("reloademote", "Reloads NPC Emotes", AccountStatus::QuestTroupe, command_reloademote) ||
 		command_add("reloadlevelmods", nullptr, AccountStatus::Max, command_reloadlevelmods) ||
 		command_add("reloadmerchants", nullptr, AccountStatus::Max, command_reloadmerchants) ||
-		command_add("reloadperlexportsettings", nullptr, AccountStatus::Max, command_reloadperlexportsettings) ||
+		command_add("reloadperlexportsettings", "Reloads Perl event export settings globally", AccountStatus::Max, command_reloadperlexportsettings) ||
 		command_add("reloadqst", " - Clear quest cache (any argument causes it to also stop all timers)", AccountStatus::GMLeadAdmin, command_reloadqst) ||
 		command_add("reloadrulesworld", "Executes a reload of all rules in world specifically.", AccountStatus::QuestTroupe, command_reloadworldrules) ||
 		command_add("reloadstatic", "- Reload Static Zone Data globally", AccountStatus::GMLeadAdmin, command_reloadstatic) ||
diff --git a/zone/gm_commands/reloadperlexportsettings.cpp b/zone/gm_commands/reloadperlexportsettings.cpp
index 1c3137728..90f907be6 100755
--- a/zone/gm_commands/reloadperlexportsettings.cpp
+++ b/zone/gm_commands/reloadperlexportsettings.cpp
@@ -5,12 +5,9 @@ extern WorldServer worldserver;
 
 void command_reloadperlexportsettings(Client *c, const Seperator *sep)
 {
-	if (c) {
-		auto pack = new ServerPacket(ServerOP_ReloadPerlExportSettings, 0);
-		worldserver.SendPacket(pack);
-		c->Message(Chat::Red, "Successfully sent the packet to world to reload Perl Export settings");
-		safe_delete(pack);
-
-	}
+	c->Message(Chat::White, "Attempting to reload Perl event export settings globally.");
+	auto pack = new ServerPacket(ServerOP_ReloadPerlExportSettings, 0);
+	worldserver.SendPacket(pack);
+	safe_delete(pack);
 }
 
diff --git a/zone/worldserver.cpp b/zone/worldserver.cpp
index d3f0b9f41..e792500da 100644
--- a/zone/worldserver.cpp
+++ b/zone/worldserver.cpp
@@ -2046,6 +2046,30 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 		break;
 	}
 	case ServerOP_ReloadPerlExportSettings: {
+		if (zone) {
+			worldserver.SendEmoteMessage(
+				0,
+				0,
+				AccountStatus::GMAdmin,
+				Chat::Yellow,
+				fmt::format(
+					"Perl event export settings reloaded for {}{}.",
+					fmt::format(
+						"{} ({})",
+						zone->GetLongName(),
+						zone->GetZoneID()
+					),
+					(
+						zone->GetInstanceID() ?
+						fmt::format(
+							" (Instance ID {})",
+							zone->GetInstanceID()
+						) :
+						""
+					)
+				).c_str()
+			);
+		}
 		parse->LoadPerlEventExportSettings(parse->perl_event_export_settings);
 		break;
 	}