Fix bodyguard getting two messages for jailed target

server/src/game/role/bodyguard.rs

@@ -82,12 +82,12 @@ impl RoleStateImpl for Bodyguard {
                 let Some(visit) = actor_ref.night_visits(game).first() else {return};
                 let target_ref = visit.target;
 
-                if target_ref.night_jailed(game){
-                    actor_ref.push_night_message(game, ChatMessage::TargetJailed);
-                    return
-                }
-
                 if actor_ref == target_ref {
+                    if target_ref.night_jailed(game){
+                        actor_ref.push_night_message(game, ChatMessage::TargetJailed);
+                        return
+                    }
+
                     let self_shields_remaining = self.self_shields_remaining - 1;
                     target_ref.increase_defense_to(game, 2);
                     actor_ref.set_role_state(game, RoleState::Bodyguard(Bodyguard{ self_shields_remaining, target_protected_ref: self.target_protected_ref, redirected_player_refs: self.redirected_player_refs }));

server/tests/role.rs

@@ -892,4 +892,37 @@ fn vampire_convert_bodyguard() {
 
     assert!(vamp.role_state().role() == Role::Vampire);
     assert!(bg.role_state().role() == Role::Vampire);
+}
+
+#[test]
+fn bodyguard_gets_single_target_jailed_message() {
+    kit::scenario!(game where
+        bg: Bodyguard,
+        jailor: Jailor,
+        _maf: Mafioso,
+        townie: Sheriff
+    );
+
+    jailor.day_target(townie);
+
+    game.next_phase();
+
+    bg.set_night_target(townie);
+
+    game.next_phase();
+
+    assert_eq!(
+        bg.get_messages_after_last_message(
+            ChatMessage::PhaseChange { 
+                phase_type: PhaseType::Night, day_number: 1
+            }
+        ),
+        vec![
+            ChatMessage::TargetJailed,
+            /* They should not get a second TargetJailed message */
+            ChatMessage::PhaseChange { 
+                phase_type: PhaseType::Morning, day_number: 2 
+            }
+        ]
+    );
 }