[Commands] Cleanup #reloadzps Command. (#2129)

* [Commands] Cleanup #reloadzps Command.
- Cleanup messages and logic.
- Make reloading of zone points global instead of zone specific.

* Further cleanup.
- Add zone->GetZoneDescription().
- Add mob->GetTargetDescription(mob).

* Final cleanup.

* Typo.

zone/worldserver.cpp

@@ -168,9 +168,8 @@ void WorldServer::OnConnected() {
 			0,
 			Chat::Yellow,
 			fmt::format(
-				"Zone Connected | {} ({})",
-				zone->GetLongName(),
-				zone->GetZoneID()
+				"Zone Connected | {}",
+				zone->GetZoneDescription()
 			).c_str()
 		);
 		zone->GetTimeSync();
@@ -193,14 +192,10 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 	ServerPacket *pack = &tpack;
 
 	switch (opcode) {
-	case 0: {
-		break;
-	}
+	case 0:
 	case ServerOP_KeepAlive: {
-		// ignore this
 		break;
 	}
-							 // World is tellins us what port to use.
 	case ServerOP_SetConnectInfo: {
 		if (pack->size != sizeof(ServerConnectInfo))
 			break;
@@ -255,7 +250,6 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 		break;
 	}
 	case ServerOP_VoiceMacro: {
-
 		if (!is_zone_loaded)
 			break;
 
@@ -270,46 +264,45 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 		vmo->MacroNumber = svm->MacroNumber;
 
 		switch (svm->Type) {
-		case VoiceMacroTell: {
-			Client* c = entity_list.GetClientByName(svm->To);
-			if (!c)
+			case VoiceMacroTell: {
+				Client* c = entity_list.GetClientByName(svm->To);
+				if (!c)
+					break;
+
+				c->QueuePacket(outapp);
 				break;
-
-			c->QueuePacket(outapp);
-			break;
-		}
-
-		case VoiceMacroGroup: {
-			Group* g = entity_list.GetGroupByID(svm->GroupID);
-
-			if (!g)
-				break;
-
-			for (unsigned int i = 0; i < MAX_GROUP_MEMBERS; i++) {
-				if (g->members[i] && g->members[i]->IsClient())
-					g->members[i]->CastToClient()->QueuePacket(outapp);
-
 			}
-			break;
-		}
 
-		case VoiceMacroRaid: {
-			Raid *r = entity_list.GetRaidByID(svm->RaidID);
+			case VoiceMacroGroup: {
+				Group* g = entity_list.GetGroupByID(svm->GroupID);
 
-			if (!r)
+				if (!g)
+					break;
+
+				for (unsigned int i = 0; i < MAX_GROUP_MEMBERS; i++) {
+					if (g->members[i] && g->members[i]->IsClient())
+						g->members[i]->CastToClient()->QueuePacket(outapp);
+
+				}
 				break;
+			}
 
-			for (int i = 0; i < MAX_RAID_MEMBERS; i++)
-				if (r->members[i].member)
-					r->members[i].member->QueuePacket(outapp);
+			case VoiceMacroRaid: {
+				Raid *r = entity_list.GetRaidByID(svm->RaidID);
 
-			break;
-		}
+				if (!r)
+					break;
+
+				for (int i = 0; i < MAX_RAID_MEMBERS; i++)
+					if (r->members[i].member)
+						r->members[i].member->QueuePacket(outapp);
+
+				break;
+			}
 		}
 		safe_delete(outapp);
 		break;
 	}
-
 	case ServerOP_SpawnCondition: {
 		if (pack->size != sizeof(ServerSpawnCondition_Struct))
 			break;
@@ -532,9 +525,8 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 				0,
 				Chat::Yellow,
 				fmt::format(
-					"Zone Shutdown | {} ({})",
-					zone->GetLongName(),
-					zone->GetZoneID()
+					"Zone Shutdown | {}",
+					zone->GetZoneDescription()
 				).c_str()
 			);
 
@@ -562,9 +554,8 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 					0,
 					Chat::White,
 					fmt::format(
-						"Zone Bootup Failed | {} ({}) Already running",
-						zone->GetLongName(),
-						zone->GetZoneID()
+						"Zone Bootup Failed | {} Already running",
+						zone->GetZoneDescription()
 					).c_str()
 				);
 			}
@@ -690,9 +681,8 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 						skp->name,
 						is_zone_loaded ?
 						fmt::format(
-							"in {} ({})",
-							zone->GetLongName(),
-							zone->GetZoneID()
+							"in {}",
+							zone->GetZoneDescription()
 						) :
 						""
 					).c_str()
@@ -726,9 +716,8 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 						skp->target,
 						is_zone_loaded ?
 						fmt::format(
-							"in {} ({})",
-							zone->GetLongName(),
-							zone->GetZoneID()
+							"in {}",
+							zone->GetZoneDescription()
 						) :
 						""
 					).c_str()
@@ -747,22 +736,17 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 		}
 		break;
 	}
-
-							  //hand all the guild related packets to the guild manager for processing.
 	case ServerOP_OnlineGuildMembersResponse:
 	case ServerOP_RefreshGuild:
-		//	case ServerOP_GuildInvite:
 	case ServerOP_DeleteGuild:
 	case ServerOP_GuildCharRefresh:
 	case ServerOP_GuildMemberUpdate:
 	case ServerOP_GuildRankUpdate:
 	case ServerOP_LFGuildUpdate:
-		//	case ServerOP_GuildGMSet:
-		//	case ServerOP_GuildGMSetRank:
-		//	case ServerOP_GuildJoin:
+	{
 		guild_mgr.ProcessWorldPacket(pack);
 		break;
-
+	}
 	case ServerOP_FlagUpdate: {
 		Client* client = entity_list.GetClientByAccID(*((uint32*)pack->pBuffer));
 		if (client) {
@@ -785,10 +769,9 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 				0,
 				Chat::Red,
 				fmt::format(
-					"Summoning you to {} ({}) in {} at {:.2f}, {:.2f}, {:.2f}",
+					"Summoning you to {} in {} at {:.2f}, {:.2f}, {:.2f}",
 					client->GetCleanName(),
-					zone->GetLongName(),
-					zone->GetZoneID(),
+					zone->GetZoneDescription(),
 					client->GetX(),
 					client->GetY(),
 					client->GetZ()
@@ -987,9 +970,8 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 				0,
 				Chat::White,
 				fmt::format(
-					"Zone {} ({}) | {} {}.",
-					zone->GetLongName(),
-					zone->GetZoneID(),
+					"Zone {} | {} {}.",
+					zone->GetZoneDescription(),
 					rev->toggle ? "Revoking" : "Unrevoking",
 					client->GetCleanName()
 				).c_str()
@@ -1235,7 +1217,6 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 		}
 		break;
 	}
-
 	case ServerOP_ForceGroupUpdate: {
 		ServerForceGroupUpdate_Struct* fgu = (ServerForceGroupUpdate_Struct*)pack->pBuffer;
 		if (zone) {
@@ -1246,7 +1227,6 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 		}
 		break;
 	}
-
 	case ServerOP_OOZGroupMessage: {
 		ServerGroupChannelMessage_Struct* gcm = (ServerGroupChannelMessage_Struct*)pack->pBuffer;
 		if (zone) {
@@ -1284,7 +1264,6 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 		}
 		break;
 	}
-
 	case ServerOP_RaidRemove: {
 		ServerRaidGeneralAction_Struct* rga = (ServerRaidGeneralAction_Struct*)pack->pBuffer;
 		if (zone) {
@@ -1305,7 +1284,6 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 		}
 		break;
 	}
-
 	case ServerOP_RaidDisband: {
 		ServerRaidGeneralAction_Struct* rga = (ServerRaidGeneralAction_Struct*)pack->pBuffer;
 		if (zone) {
@@ -1321,7 +1299,6 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 		}
 		break;
 	}
-
 	case ServerOP_RaidLockFlag: {
 		ServerRaidGeneralAction_Struct* rga = (ServerRaidGeneralAction_Struct*)pack->pBuffer;
 		if (zone) {
@@ -1339,7 +1316,6 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 		}
 		break;
 	}
-
 	case ServerOP_RaidChangeGroup: {
 		ServerRaidGeneralAction_Struct* rga = (ServerRaidGeneralAction_Struct*)pack->pBuffer;
 		if (zone) {
@@ -1368,7 +1344,6 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 		}
 		break;
 	}
-
 	case ServerOP_UpdateGroup: {
 		ServerRaidGeneralAction_Struct* rga = (ServerRaidGeneralAction_Struct*)pack->pBuffer;
 		if (zone) {
@@ -1382,7 +1357,6 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 		}
 		break;
 	}
-
 	case ServerOP_RaidGroupLeader: {
 		ServerRaidGeneralAction_Struct* rga = (ServerRaidGeneralAction_Struct*)pack->pBuffer;
 		if (zone) {
@@ -1391,7 +1365,6 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 		}
 		break;
 	}
-
 	case ServerOP_RaidLeader: {
 		ServerRaidGeneralAction_Struct* rga = (ServerRaidGeneralAction_Struct*)pack->pBuffer;
 		if (zone) {
@@ -1412,7 +1385,6 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 		}
 		break;
 	}
-
 	case ServerOP_DetailsChange: {
 		ServerRaidGeneralAction_Struct* rga = (ServerRaidGeneralAction_Struct*)pack->pBuffer;
 		if (zone) {
@@ -1428,7 +1400,6 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 		}
 		break;
 	}
-
 	case ServerOP_RaidGroupDisband: {
 		ServerRaidGeneralAction_Struct* rga = (ServerRaidGeneralAction_Struct*)pack->pBuffer;
 		if (zone) {
@@ -1449,7 +1420,6 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 		}
 		break;
 	}
-
 	case ServerOP_RaidGroupAdd: {
 		ServerRaidGroupAction_Struct* rga = (ServerRaidGroupAction_Struct*)pack->pBuffer;
 		if (zone) {
@@ -1480,7 +1450,6 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 		}
 		break;
 	}
-
 	case ServerOP_RaidGroupRemove: {
 		ServerRaidGroupAction_Struct* rga = (ServerRaidGroupAction_Struct*)pack->pBuffer;
 		if (zone) {
@@ -1511,7 +1480,6 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 		}
 		break;
 	}
-
 	case ServerOP_RaidGroupSay: {
 		ServerRaidMessage_Struct* rmsg = (ServerRaidMessage_Struct*)pack->pBuffer;
 		if (zone) {
@@ -1536,7 +1504,6 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 		}
 		break;
 	}
-
 	case ServerOP_RaidSay: {
 		ServerRaidMessage_Struct* rmsg = (ServerRaidMessage_Struct*)pack->pBuffer;
 		if (zone)
@@ -1560,7 +1527,6 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 		}
 		break;
 	}
-
 	case ServerOP_RaidMOTD: {
 		ServerRaidMOTD_Struct *rmotd = (ServerRaidMOTD_Struct *)pack->pBuffer;
 		if (!zone)
@@ -1572,7 +1538,6 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 		r->SendRaidMOTD();
 		break;
 	}
-
 	case ServerOP_SpawnPlayerCorpse: {
 		SpawnPlayerCorpse_Struct* s = (SpawnPlayerCorpse_Struct*)pack->pBuffer;
 		Corpse* NewCorpse = database.LoadCharacterCorpse(s->player_corpse_id);
@@ -1647,12 +1612,6 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 		}
 		break;
 	}
-	case ServerOP_ReloadTasks: {
-		if (RuleB(Tasks, EnableTaskSystem)) {
-			HandleReloadTasks(pack);
-		}
-		break;
-	}
 	case ServerOP_LFGMatches: {
 		HandleLFGMatches(pack);
 		break;
@@ -1661,7 +1620,6 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 		HandleLFPMatches(pack);
 		break;
 	}
-
 	case ServerOP_UpdateSpawn: {
 		if (zone)
 		{
@@ -1683,7 +1641,6 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 		}
 		break;
 	}
-
 	case ServerOP_InstanceUpdateTime:
 	{
 		ServerInstanceUpdateTime_Struct *iut = (ServerInstanceUpdateTime_Struct*)pack->pBuffer;
@@ -1696,7 +1653,6 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 		}
 		break;
 	}
-
 	case ServerOP_DepopAllPlayersCorpses:
 	{
 		ServerDepopAllPlayersCorpses_Struct *sdapcs = (ServerDepopAllPlayersCorpses_Struct *)pack->pBuffer;
@@ -1707,7 +1663,6 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 		break;
 
 	}
-
 	case ServerOP_DepopPlayerCorpse:
 	{
 		ServerDepopPlayerCorpse_Struct *sdpcs = (ServerDepopPlayerCorpse_Struct *)pack->pBuffer;
@@ -1718,38 +1673,6 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 		break;
 
 	}
-
-	case ServerOP_ReloadTitles:
-	{
-		if (zone) {
-			worldserver.SendEmoteMessage(
-				0,
-				0,
-				AccountStatus::GMAdmin,
-				Chat::Yellow,
-				fmt::format(
-					"Titles reloaded for {}{}.",
-					fmt::format(
-						"{} ({})",
-						zone->GetLongName(),
-						zone->GetZoneID()
-					),
-					(
-						zone->GetInstanceID() ?
-						fmt::format(
-							" (Instance ID {})",
-							zone->GetInstanceID()
-						) :
-						""
-					)
-				).c_str()
-			);
-		}
-
-		title_manager.LoadTitles();
-		break;
-	}
-
 	case ServerOP_SpawnStatusChange:
 	{
 		if (zone)
@@ -1783,7 +1706,6 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 		}
 		break;
 	}
-
 	case ServerOP_QGlobalUpdate:
 	{
 		if (pack->size != sizeof(ServerQGlobalUpdate_Struct))
@@ -1809,7 +1731,6 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 		}
 		break;
 	}
-
 	case ServerOP_QGlobalDelete:
 	{
 		if (pack->size != sizeof(ServerQGlobalDelete_Struct))
@@ -1828,7 +1749,6 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 		}
 		break;
 	}
-
 	case ServerOP_AdventureRequestAccept:
 	{
 		ServerAdventureRequestAccept_Struct *ars = (ServerAdventureRequestAccept_Struct*)pack->pBuffer;
@@ -1840,7 +1760,6 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 		}
 		break;
 	}
-
 	case ServerOP_AdventureRequestDeny:
 	{
 		ServerAdventureRequestDeny_Struct *ars = (ServerAdventureRequestDeny_Struct*)pack->pBuffer;
@@ -1852,7 +1771,6 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 		}
 		break;
 	}
-
 	case ServerOP_AdventureCreateDeny:
 	{
 		Client *c = entity_list.GetClientByName((const char*)pack->pBuffer);
@@ -1863,7 +1781,6 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 		}
 		break;
 	}
-
 	case ServerOP_AdventureData:
 	{
 		Client *c = entity_list.GetClientByName((const char*)pack->pBuffer);
@@ -1879,7 +1796,6 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 		}
 		break;
 	}
-
 	case ServerOP_AdventureDataClear:
 	{
 		Client *c = entity_list.GetClientByName((const char*)pack->pBuffer);
@@ -1893,7 +1809,6 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 		}
 		break;
 	}
-
 	case ServerOP_AdventureClickDoorReply:
 	{
 		ServerPlayerClickedAdventureDoorReply_Struct *adr = (ServerPlayerClickedAdventureDoorReply_Struct*)pack->pBuffer;
@@ -1905,7 +1820,6 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 		}
 		break;
 	}
-
 	case ServerOP_AdventureClickDoorError:
 	{
 		Client *c = entity_list.GetClientByName((const char*)pack->pBuffer);
@@ -1916,7 +1830,6 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 		}
 		break;
 	}
-
 	case ServerOP_AdventureLeaveReply:
 	{
 		Client *c = entity_list.GetClientByName((const char*)pack->pBuffer);
@@ -1927,7 +1840,6 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 		}
 		break;
 	}
-
 	case ServerOP_AdventureLeaveDeny:
 	{
 		Client *c = entity_list.GetClientByName((const char*)pack->pBuffer);
@@ -1938,7 +1850,6 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 		}
 		break;
 	}
-
 	case ServerOP_AdventureCountUpdate:
 	{
 		ServerAdventureCountUpdate_Struct *ac = (ServerAdventureCountUpdate_Struct*)pack->pBuffer;
@@ -1949,7 +1860,6 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 		}
 		break;
 	}
-
 	case ServerOP_AdventureZoneData:
 	{
 		if (zone)
@@ -1961,7 +1871,6 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 		}
 		break;
 	}
-
 	case ServerOP_AdventureFinish:
 	{
 		ServerAdventureFinish_Struct *af = (ServerAdventureFinish_Struct*)pack->pBuffer;
@@ -1972,7 +1881,6 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 		}
 		break;
 	}
-
 	case ServerOP_AdventureLeaderboard:
 	{
 		Client *c = entity_list.GetClientByName((const char*)pack->pBuffer);
@@ -1985,239 +1893,85 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 		}
 		break;
 	}
-	case ServerOP_ReloadRules: {
-		if (zone) {
-			worldserver.SendEmoteMessage(
-				0,
-				0,
-				AccountStatus::GMAdmin,
-				Chat::Yellow,
-				fmt::format(
-					"Rules reloaded for {}{}.",
-					fmt::format(
-						"{} ({})",
-						zone->GetLongName(),
-						zone->GetZoneID()
-					),
-					(
-						zone->GetInstanceID() ?
-						fmt::format(
-							" (Instance ID {})",
-							zone->GetInstanceID()
-						) :
-						""
-					)
-				).c_str()
-			);
-		}
-		RuleManager::Instance()->LoadRules(&database, RuleManager::Instance()->GetActiveRuleset(), true);
+	case ServerOP_ReloadAAData:
+  {
+		zone->SendReloadMessage("Alternate Advancement Data");
+		zone->LoadAlternateAdvancement();
 		break;
 	}
-	case ServerOP_ReloadContentFlags: {
-		if (zone) {
-			worldserver.SendEmoteMessage(
-				0,
-				0,
-				AccountStatus::GMAdmin,
-				Chat::Yellow,
-				fmt::format(
-					"Content flags (and expansion) reloaded for {}{}.",
-					fmt::format(
-						"{} ({})",
-						zone->GetLongName(),
-						zone->GetZoneID()
-					),
-					(
-						zone->GetInstanceID() ?
-						fmt::format(
-							" (Instance ID {})",
-							zone->GetInstanceID()
-						) :
-						""
-					)
-				).c_str()
-			);
-		}
-		content_service.SetExpansionContext()->ReloadContentFlags();
-		break;
-	}
-	case ServerOP_ReloadLogs: {
-		LogSys.LoadLogDatabaseSettings();
-		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;
-	}
-case ServerOP_ReloadTraps:
+	case ServerOP_ReloadContentFlags:
 	{
-		if (zone) {
-			worldserver.SendEmoteMessage(
-				0,
-				0,
-				AccountStatus::GMAdmin,
-				Chat::Yellow,
-				fmt::format(
-					"Traps reloaded for {}{}.",
-					fmt::format(
-						"{} ({})",
-						zone->GetLongName(),
-						zone->GetZoneID()
-					),
-					(
-						zone->GetInstanceID() ?
-						fmt::format(
-							" (Instance ID {})",
-							zone->GetInstanceID()
-						) :
-						""
-					)
-				).c_str()
-			);
-
-			entity_list.UpdateAllTraps(true, true);
-		}
+		zone->SendReloadMessage("Content Flags");
+		content_service.SetExpansionContext()->ReloadContentFlags();
 		break;
 	}
 	case ServerOP_ReloadLevelEXPMods:
 	{
-		if (zone) {
-			worldserver.SendEmoteMessage(
-				0,
-				0,
-				AccountStatus::GMAdmin,
-				Chat::Yellow,
-				fmt::format(
-					"Level based experience modifiers reloaded for {}{}.",
-					fmt::format(
-						"{} ({})",
-						zone->GetLongName(),
-						zone->GetZoneID()
-					),
-					(
-						zone->GetInstanceID() ?
-						fmt::format(
-							" (Instance ID {})",
-							zone->GetInstanceID()
-						) :
-						""
-					)
-				).c_str()
-			);
-
-			zone->LoadLevelEXPMods();
-		}
+		zone->SendReloadMessage("Level Based Experience Modifiers");
+		zone->LoadLevelEXPMods();
 		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();
-		}
+	case ServerOP_ReloadLogs:
+	{
+		zone->SendReloadMessage("Log Settings");
+		LogSys.LoadLogDatabaseSettings();
 		break;
 	}
-	case ServerOP_ReloadMerchants: {
-		if (zone) {
-			worldserver.SendEmoteMessage(
-				0,
-				0,
-				AccountStatus::GMAdmin,
-				Chat::Yellow,
-				fmt::format(
-					"Merchants reloaded for {}{}.",
-					fmt::format(
-						"{} ({})",
-						zone->GetLongName(),
-						zone->GetZoneID()
-					),
-					(
-						zone->GetInstanceID() ?
-						fmt::format(
-							" (Instance ID {})",
-							zone->GetInstanceID()
-						) :
-						""
-					)
-				).c_str()
-			);
-
-			entity_list.ReloadMerchants();
-		}
+	case ServerOP_ReloadMerchants: {		
+		zone->SendReloadMessage("Merchants");
+		entity_list.ReloadMerchants();
+		break;
+	}
+	case ServerOP_ReloadPerlExportSettings:
+	{
+		zone->SendReloadMessage("Perl Event Export Settings");
+		parse->LoadPerlEventExportSettings(parse->perl_event_export_settings);
+		break;
+	}
+	case ServerOP_ReloadRules:
+	{
+		zone->SendReloadMessage("Rules");
+		RuleManager::Instance()->LoadRules(&database, RuleManager::Instance()->GetActiveRuleset(), true);
 		break;
 	}
 	case ServerOP_ReloadStaticZoneData: {
-		if (zone) {
-			worldserver.SendEmoteMessage(
-				0,
-				0,
-				AccountStatus::GMAdmin,
-				Chat::Yellow,
-				fmt::format(
-					"Static zone data reloaded for {}{}.",
-					fmt::format(
-						"{} ({})",
-						zone->GetLongName(),
-						zone->GetZoneID()
-					),
-					(
-						zone->GetInstanceID() ?
-						fmt::format(
-							" (Instance ID {})",
-							zone->GetInstanceID()
-						) :
-						""
-					)
-				).c_str()
-			);
-
-			zone->ReloadStaticData();
+		zone->SendReloadMessage("Static Zone Data");
+		zone->ReloadStaticData();
+		break;
+	}
+	case ServerOP_ReloadTasks:
+	{
+		if (RuleB(Tasks, EnableTaskSystem)) {
+			zone->SendReloadMessage("Tasks");
+			HandleReloadTasks(pack);
 		}
+
+		break;
+	}
+	case ServerOP_ReloadTitles:
+	{
+		zone->SendReloadMessage("Titles");
+		title_manager.LoadTitles();
+		break;
+	}
+	case ServerOP_ReloadTraps:
+	{
+		zone->SendReloadMessage("Traps");
+		entity_list.UpdateAllTraps(true, true);
+		break;
+	}
+	case ServerOP_ReloadWorld:
+	{
+		auto* reload_world = (ReloadWorld_Struct*)pack->pBuffer;
+		if (zone) {
+			zone->ReloadWorld(reload_world->global_repop);
+		}
+		break;
+	}
+	case ServerOP_ReloadZonePoints:
+	{
+		zone->SendReloadMessage("Zone Points");
+		content_db.LoadStaticZonePoints(&zone->zone_point_list, zone->GetShortName(), zone->GetInstanceVersion());
 		break;
 	}
 	case ServerOP_CameraShake:
@@ -3296,16 +3050,6 @@ case ServerOP_ReloadTraps:
 		}
 		break;
 	}
-
-	case ServerOP_ReloadWorld:
-	{
-		auto* reload_world = (ReloadWorld_Struct*)pack->pBuffer;
-		if (zone) {
-			zone->ReloadWorld(reload_world->global_repop);
-		}
-		break;
-	}
-
 	case ServerOP_UpdateSchedulerEvents: {
 		LogScheduler("Received signal from world to update");
 		if (m_zone_scheduler) {
@@ -3314,7 +3058,6 @@ case ServerOP_ReloadTraps:
 
 		break;
 	}
-
 	case ServerOP_HotReloadQuests:
 	{
 		if (!zone) {
@@ -3445,9 +3188,6 @@ case ServerOP_ReloadTraps:
 	}
 	default: {
 		LogInfo("[HandleMessage] Unknown ZS Opcode [{}] size [{}]", (int)pack->opcode, pack->size);
-
-//		std::cout << " Unknown ZSopcode:" << (int)pack->opcode;
-//		std::cout << " size:" << pack->size << std::endl;
 		break;
 	}
 	}