Merge branch 'dev' of https://github.com/ExMod-Team/EXILED into dev

Author: louis1706

EXILED/Exiled.API/Features/DamageHandlers/DamageHandlerBase.cs

@@ -289,7 +289,7 @@ public static implicit operator BaseHandler.CassieAnnouncement(CassieAnnouncemen
                 new()
                 {
                     Announcement = cassieAnnouncement.Announcement,
-                    SubtitleParts = cassieAnnouncement.SubtitleParts.ToArray(),
+                    SubtitleParts = cassieAnnouncement.SubtitleParts?.ToArray() ?? Array.Empty<Subtitles.SubtitlePart>(),
                 };
 
             /// <summary>

EXILED/Exiled.API/Features/DamageHandlers/GenericDamageHandler.cs

@@ -233,6 +233,11 @@ public GenericDamageHandler(Player player, Player attacker, float damage, Damage
         /// </summary>
         public PlayerStatsSystem.DamageHandlerBase Base { get; set; }
 
+        /// <summary>
+        /// Gets the <see cref="PlayerStatsSystem.DamageHandlerBase.CassieAnnouncement"/> the base game uses when a player dies.
+        /// </summary>
+        public override CassieAnnouncement CassieDeathAnnouncement => customCassieAnnouncement;
+
         /// <summary>
         /// Gets or sets the current attacker.
         /// </summary>

EXILED/Exiled.Events/Patches/Events/Map/AnnouncingTeamEntrance.cs

@@ -28,22 +28,32 @@ namespace Exiled.Events.Patches.Events.Map
     [HarmonyPatch(typeof(WaveAnnouncementBase), nameof(WaveAnnouncementBase.PlayAnnouncement))]
     internal static class AnnouncingTeamEntrance
     {
-        private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instruction, ILGenerator generator)
+        private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
         {
-            List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instruction);
+            List<CodeInstruction> newInstructions = ListPool<CodeInstruction>.Pool.Get(instructions);
 
             Label returnLabel = generator.DefineLabel();
 
-            int index = newInstructions.FindLastIndex(i => i.opcode == OpCodes.Ldsfld);
+            // the instruction that sends subtitles is called before stringReturn is created (and thus checked) so we need to move it so that empty (or disallowed) message's subtitles are not sent.
+            // this removes the Ldarg_0 and the CallVirt
+            int index = newInstructions.FindIndex(instruction => instruction.Calls(Method(typeof(WaveAnnouncementBase), nameof(WaveAnnouncementBase.SendSubtitles))));
+            CodeInstruction sendSubtitlesInstruction = newInstructions[index];
+            newInstructions.RemoveRange(index - 1, 2);
 
-            newInstructions.InsertRange(index, new CodeInstruction[]
+            index = newInstructions.FindLastIndex(i => i.opcode == OpCodes.Ldsfld);
+
+            newInstructions.InsertRange(index, new[]
             {
                 // if (stringReturn == "")
                 //     return;
                 new(OpCodes.Ldloc_S, 4),
                 new(OpCodes.Ldstr, string.Empty),
                 new(OpCodes.Ceq),
                 new(OpCodes.Brtrue_S, returnLabel),
+
+                // send subtitles before cassie message, but after our check.
+                new(OpCodes.Ldarg_0),
+                sendSubtitlesInstruction,
             });
 
             newInstructions[newInstructions.Count - 1].labels.Add(returnLabel);