From c1aa3e7056c983903555e2488e6060e48406e151 Mon Sep 17 00:00:00 2001
From: Kinglykrab <89047260+Kinglykrab@users.noreply.github.com>
Date: Fri, 6 May 2022 20:26:39 -0400
Subject: [PATCH] [Commands] Cleanup #reloadallrules Command. (#2121)

* [Commands] Cleanup #reloadallrules Command.
- Cleanup messages.

* Typo.
---
 zone/command.cpp                    |  2 +-
 zone/gm_commands/reloadallrules.cpp | 11 ++++-------
 zone/worldserver.cpp                |  4 ++--
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/zone/command.cpp b/zone/command.cpp
index 15b8760bd..ef6ecf26a 100755
--- a/zone/command.cpp
+++ b/zone/command.cpp
@@ -288,7 +288,7 @@ int command_init(void)
 		command_add("randomfeatures", "- Temporarily randomizes the Facial Features of your target", AccountStatus::QuestTroupe, command_randomfeatures) ||
 		command_add("refreshgroup", "- Refreshes Group.", AccountStatus::Player, command_refreshgroup) ||
 		command_add("reloadaa", "Reloads AA data", AccountStatus::GMMgmt, command_reloadaa) ||
-		command_add("reloadallrules", "Executes a reload of all rules.", AccountStatus::QuestTroupe, command_reloadallrules) ||
+		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) ||
 		command_add("reloadlevelmods", nullptr, AccountStatus::Max, command_reloadlevelmods) ||
diff --git a/zone/gm_commands/reloadallrules.cpp b/zone/gm_commands/reloadallrules.cpp
index d5fb8b757..01d86a8b8 100755
--- a/zone/gm_commands/reloadallrules.cpp
+++ b/zone/gm_commands/reloadallrules.cpp
@@ -5,12 +5,9 @@ extern WorldServer worldserver;
 
 void command_reloadallrules(Client *c, const Seperator *sep)
 {
-	if (c) {
-		auto pack = new ServerPacket(ServerOP_ReloadRules, 0);
-		worldserver.SendPacket(pack);
-		c->Message(Chat::Red, "Successfully sent the packet to world to reload rules globally. (including world)");
-		safe_delete(pack);
-
-	}
+	c->Message(Chat::White, "Attempting to reload all rules globally.");
+	auto pack = new ServerPacket(ServerOP_ReloadRules, 0);
+	worldserver.SendPacket(pack);
+	safe_delete(pack);
 }
 
diff --git a/zone/worldserver.cpp b/zone/worldserver.cpp
index e792500da..b14a024db 100644
--- a/zone/worldserver.cpp
+++ b/zone/worldserver.cpp
@@ -1993,7 +1993,7 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 				AccountStatus::GMAdmin,
 				Chat::Yellow,
 				fmt::format(
-					"Rules reloaded for {}.",
+					"Rules reloaded for {}{}.",
 					fmt::format(
 						"{} ({})",
 						zone->GetLongName(),
@@ -2002,7 +2002,7 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 					(
 						zone->GetInstanceID() ?
 						fmt::format(
-							"Instance ID: {}",
+							" (Instance ID {})",
 							zone->GetInstanceID()
 						) :
 						""