fixed inconsistencies with despawn and limb messages for Moon Lord

Author: SheepishShepherd

BossChecklist.cs

@@ -375,7 +375,7 @@ public override void HandlePacket(BinaryReader reader, int whoAmI) {
 						NPC limbNPC = Main.npc[reader.ReadInt32()];
 						bossTracker.IsEntryLimb(limbNPC.type, out EntryInfo limbEntry);
 						if (limbEntry is not null && limbEntry.GetLimbMessage(limbNPC) is LocalizedText limbMessage)
-							Main.NewText(limbMessage.Format(limbNPC.FullName), Colors.RarityPurple);
+							Main.NewText(limbMessage.Format(limbNPC.FullName), Colors.RarityGreen);
 					}
 					else if (messageType == ClientMessageType.Moon) {
 						if (WorldAssist.DetermineMoonAnnoucement(reader.ReadString()) is string message)

BossTracker.cs

@@ -156,7 +156,7 @@ private void InitializeVanillaEntries() {
 				EntryInfo.MakeVanillaBoss(EntryType.Boss, LunaticCultist, "NPCName.CultistBoss", NPCID.CultistBoss, () => NPC.downedAncientCultist)
 					.WithCustomPortrait($"BossChecklist/Resources/BossTextures/Boss{NPCID.CultistBoss}"),
 				EntryInfo.MakeVanillaBoss(EntryType.Boss, Moonlord, "Enemies.MoonLord", new List<int>() { NPCID.MoonLordHead }, () => NPC.downedMoonlord)
-					.WithCustomLimbs(new List<int>() { NPCID.MoonLordCore, NPCID.MoonLordHand })
+					.WithCustomLimbs(new List<int>() { NPCID.MoonLordHead, NPCID.MoonLordHand })
 					.WithCustomPortrait($"BossChecklist/Resources/BossTextures/Boss{NPCID.MoonLordHead}"),
 
 				// Minibosses and Events -- Vanilla

NPCAssist.cs

@@ -31,9 +31,23 @@ public override void OnSpawn(NPC npc, IEntitySource source) {
 		// Special case for moon lord. The hands and head do not 'die' when the messages need to be triggered
 		public override void HitEffect(NPC npc, NPC.HitInfo hit) {
 			if ((npc.type == NPCID.MoonLordHand || npc.type == NPCID.MoonLordHead) && npc.life <= 0) {
+				if (Main.npc.Any(x => x.type == NPCID.MoonLordCore && x.life <= 0))
+					return; // Messages shouldn't be sent if the Moon Lord's core is defeated as that would mean the entire boss is defeated
+
 				if (BossChecklist.bossTracker.IsEntryLimb(npc.type, out EntryInfo limbEntry) && limbEntry.GetLimbMessage(npc) is LocalizedText message) {
-					if (Main.netMode != NetmodeID.Server)
+					if (Main.netMode == NetmodeID.SinglePlayer) {
 						Main.NewText(message.Format(npc.FullName), Colors.RarityGreen);
+					}
+					else if (Main.netMode == NetmodeID.Server) {
+						// Send a packet to all multiplayer clients. Limb messages are client based, so they will need to read their own configs to determine the message.
+						foreach (Player player in Main.ActivePlayers) {
+							ModPacket packet = BossChecklist.instance.GetPacket();
+							packet.Write((byte)PacketMessageType.SendClientConfigMessage);
+							packet.Write((byte)ClientMessageType.Limb);
+							packet.Write(npc.whoAmI);
+							packet.Send(player.whoAmI); // Server --> Multiplayer client
+						}
+					}
 				}
 			}
 		}
@@ -46,7 +60,7 @@ public override void OnKill(NPC npc) {
 			// Display a message for Limbs/Towers if config is enabled, which should be checked after the active flags update
 			if (BossChecklist.bossTracker.IsEntryLimb(npc.type, out EntryInfo limbEntry) && limbEntry.GetLimbMessage(npc) is LocalizedText message) {
 				if (Main.netMode == NetmodeID.SinglePlayer) {
-					Main.NewText(message.Format(npc.FullName), Colors.RarityPurple);
+					Main.NewText(message.Format(npc.FullName), Colors.RarityGreen);
 				}
 				else if (Main.netMode == NetmodeID.Server) {
 					// Send a packet to all multiplayer clients. Limb messages are client based, so they will need to read their own configs to determine the message.

WorldAssist.cs

@@ -263,7 +263,8 @@ public void HandleDespawnFlags() {
 					continue; // do nothing if any other npcs are apart of the entry and are still active
 
 				// Now that the entry no longer exists within ActiveNPCEntryFlags, it is determined to have despawned
-				if (selectedEntry.GetDespawnMessage(npc) is LocalizedText message) {
+				// The Moon Lord has a special case, since it technically despawns when its killed
+				if (selectedEntry.GetDespawnMessage(npc) is LocalizedText message && (selectedEntry.Key != "Terraria MoonLord" || npc.life > 0)) {
 					if (Main.netMode == NetmodeID.SinglePlayer) {
 						Main.NewText(message.Format(npc.FullName), Colors.RarityPurple);
 					}