From e7e77b83af02955e6cda97fae7901620e09f9ba1 Mon Sep 17 00:00:00 2001
From: Kinglykrab <kinglykrab@gmail.com>
Date: Sun, 14 Aug 2022 19:34:54 -0400
Subject: [PATCH] Remove unnecessary packet sending.

---
 common/servertalk.h         | 39 ++++++++++++++++++-------------------
 world/zoneserver.cpp        |  1 -
 zone/gm_commands/reload.cpp |  5 +++--
 zone/worldserver.cpp        |  6 ------
 4 files changed, 22 insertions(+), 29 deletions(-)

diff --git a/common/servertalk.h b/common/servertalk.h
index 3ad54d289..ee1ead831 100644
--- a/common/servertalk.h
+++ b/common/servertalk.h
@@ -226,26 +226,25 @@
 #define ServerOP_ReloadAAData 0x4100
 #define ServerOP_ReloadAlternateCurrencies 0x4101
 #define ServerOP_ReloadBlockedSpells 0x4102
-#define ServerOP_ReloadCommands 0x4103
-#define ServerOP_ReloadContentFlags 0x4104
-#define ServerOP_ReloadDoors 0x4105
-#define ServerOP_ReloadGroundSpawns 0x4106
-#define ServerOP_ReloadLevelEXPMods 0x4107
-#define ServerOP_ReloadLogs 0x4108
-#define ServerOP_ReloadMerchants 0x4109
-#define ServerOP_ReloadNPCEmotes 0x4110
-#define ServerOP_ReloadObjects 0x4111
-#define ServerOP_ReloadPerlExportSettings 0x4112
-#define ServerOP_ReloadRules 0x4113
-#define ServerOP_ReloadStaticZoneData 0x4114
-#define ServerOP_ReloadTasks 0x4115
-#define ServerOP_ReloadTitles 0x4116
-#define ServerOP_ReloadTraps 0x4117
-#define ServerOP_ReloadVariables 0x4118
-#define ServerOP_ReloadVeteranRewards 0x4119
-#define ServerOP_ReloadWorld 0x4120
-#define ServerOP_ReloadZonePoints 0x4121
-#define ServerOP_ReloadDzTemplates 0x4122
+#define ServerOP_ReloadContentFlags 0x4103
+#define ServerOP_ReloadDoors 0x4104
+#define ServerOP_ReloadGroundSpawns 0x4105
+#define ServerOP_ReloadLevelEXPMods 0x4106
+#define ServerOP_ReloadLogs 0x4107
+#define ServerOP_ReloadMerchants 0x4108
+#define ServerOP_ReloadNPCEmotes 0x4109
+#define ServerOP_ReloadObjects 0x4110
+#define ServerOP_ReloadPerlExportSettings 0x4111
+#define ServerOP_ReloadRules 0x4112
+#define ServerOP_ReloadStaticZoneData 0x4113
+#define ServerOP_ReloadTasks 0x4114
+#define ServerOP_ReloadTitles 0x4115
+#define ServerOP_ReloadTraps 0x4116
+#define ServerOP_ReloadVariables 0x4117
+#define ServerOP_ReloadVeteranRewards 0x4118
+#define ServerOP_ReloadWorld 0x4119
+#define ServerOP_ReloadZonePoints 0x4120
+#define ServerOP_ReloadDzTemplates 0x4121
 
 #define ServerOP_CZDialogueWindow 0x4500
 #define ServerOP_CZLDoNUpdate 0x4501
diff --git a/world/zoneserver.cpp b/world/zoneserver.cpp
index 2d22e4a55..04549b5b8 100644
--- a/world/zoneserver.cpp
+++ b/world/zoneserver.cpp
@@ -1307,7 +1307,6 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
 		case ServerOP_ReloadAAData:
 		case ServerOP_ReloadAlternateCurrencies:
 		case ServerOP_ReloadBlockedSpells:
-		case ServerOP_ReloadCommands:
 		case ServerOP_ReloadDoors:
 		case ServerOP_ReloadGroundSpawns:
 		case ServerOP_ReloadLevelEXPMods:
diff --git a/zone/gm_commands/reload.cpp b/zone/gm_commands/reload.cpp
index 99d91ed6d..c8e213b66 100644
--- a/zone/gm_commands/reload.cpp
+++ b/zone/gm_commands/reload.cpp
@@ -77,8 +77,9 @@ void command_reload(Client *c, const Seperator *sep)
 		c->Message(Chat::White, "Attempting to reload Blocked Spells globally.");	
 		pack = new ServerPacket(ServerOP_ReloadBlockedSpells, 0);
 	} else if (is_commands) {
-		c->Message(Chat::White, "Attempting to reload Commands globally.");
-		pack = new ServerPacket(ServerOP_ReloadCommands, 0);
+		c->Message(Chat::White, "Attempting to reload Commands.");
+		command_init();
+		return;
 	} else if (is_content_flags) {
 		c->Message(Chat::White, "Attempting to reload Content Flags globally.");
 		pack = new ServerPacket(ServerOP_ReloadContentFlags, 0);
diff --git a/zone/worldserver.cpp b/zone/worldserver.cpp
index 099a4d50c..919a48e22 100644
--- a/zone/worldserver.cpp
+++ b/zone/worldserver.cpp
@@ -1916,12 +1916,6 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 		zone->LoadZoneBlockedSpells();
 		break;
 	}
-	case ServerOP_ReloadCommands:
-	{
-		zone->SendReloadMessage("Commands");
-		command_init();
-		break;
-	}
 	case ServerOP_ReloadContentFlags:
 	{
 		zone->SendReloadMessage("Content Flags");