From e2bfa44df0671011af7addff36bb021b9a2f812f Mon Sep 17 00:00:00 2001
From: Kinglykrab <89047260+Kinglykrab@users.noreply.github.com>
Date: Fri, 6 May 2022 19:50:09 -0400
Subject: [PATCH] [Commands] Cleanup #serverrules Command. (#2139)

- Cleanup messages and logic.
- Change separator from new line to pipe separator, as new line was non-functional.
---
 zone/client.cpp                  | 45 +++++++++++++++++++++++---------
 zone/client.h                    |  2 +-
 zone/gm_commands/serverrules.cpp |  2 +-
 3 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/zone/client.cpp b/zone/client.cpp
index 556fc02fd..f990701a7 100644
--- a/zone/client.cpp
+++ b/zone/client.cpp
@@ -3897,31 +3897,50 @@ void Client::GetRaidAAs(RaidLeadershipAA_Struct *into) const {
 
 void Client::EnteringMessages(Client* client)
 {
-	//server rules
 	std::string rules;
-	if(database.GetVariable("Rules", rules))
-	{
+	if (database.GetVariable("Rules", rules)) {
 		uint8 flag = database.GetAgreementFlag(client->AccountID());
-		if(!flag)
-		{
-			client->Message(Chat::Red,"You must agree to the Rules, before you can move. (type #serverrules to view the rules)");
-			client->Message(Chat::Red,"You must agree to the Rules, before you can move. (type #serverrules to view the rules)");
-			client->Message(Chat::Red,"You must agree to the Rules, before you can move. (type #serverrules to view the rules)");
+		if (!flag) {
+			auto rules_link = EQ::SayLinkEngine::GenerateQuestSaylink(
+				"#serverrules",
+				false,
+				"rules"
+			);
+
+			client->Message(
+				Chat::White,
+				fmt::format(
+					"You must agree to the {} before you can move.",
+					rules_link
+				).c_str()
+			);
+
 			client->SendAppearancePacket(AT_Anim, ANIM_FREEZE);
 		}
 	}
 }
 
-void Client::SendRules(Client* client)
+void Client::SendRules()
 {
 	std::string rules;
 
-	if (!database.GetVariable("Rules", rules))
+	if (!database.GetVariable("Rules", rules)) {
 		return;
+	}
 
-	auto lines = SplitString(rules, '\n');
-	for (auto&& e : lines)
-		client->Message(Chat::White, "%s", e.c_str());
+	auto lines = split_string(rules, "|");
+	auto line_number = 1;
+	for (auto&& line : lines) {
+		Message(
+			Chat::White,
+			fmt::format(
+				"{}. {}",
+				line_number,
+				line
+			).c_str()
+		);
+		line_number++;
+	}
 }
 
 void Client::SetEndurance(int32 newEnd)
diff --git a/zone/client.h b/zone/client.h
index 8e3f22f01..1afa32fa3 100644
--- a/zone/client.h
+++ b/zone/client.h
@@ -1035,7 +1035,7 @@ public:
 	void RemoveTitle(int titleset);
 
 	void EnteringMessages(Client* client);
-	void SendRules(Client* client);
+	void SendRules();
 
 	const bool GetGMSpeed() const { return (gmspeed > 0); }
 	bool CanUseReport;
diff --git a/zone/gm_commands/serverrules.cpp b/zone/gm_commands/serverrules.cpp
index 69bf799a7..e555e4b71 100755
--- a/zone/gm_commands/serverrules.cpp
+++ b/zone/gm_commands/serverrules.cpp
@@ -2,6 +2,6 @@
 
 void command_serverrules(Client *c, const Seperator *sep)
 {
-	c->SendRules(c);
+	c->SendRules();
 }