blasthavers/blastmud
2
1
Fork 1
Code Issues 2 Pull Requests Packages Projects 1 Releases Wiki Activity

Fix bug where we don't stop attacking NPCs when they escape.

Browse Source
This commit is contained in:
Condorra 2023-09-11 22:29:34 +10:00
parent d5641a97f7
commit daa847b448
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
blastmud_game/src/message_handler/user_commands/movement.rs
View File

@ -529,13 +529,12 @@ async fn attempt_move_immediate(
Some(attackers) => { Some(attackers) => {
let mut attacker_names = Vec::new(); let mut attacker_names = Vec::new();
let mut attacker_items = Vec::new(); let mut attacker_items = Vec::new();
if let Some((_, session_dat)) = session.as_ref() {
for attacker in &attackers[..] { for attacker in &attackers[..] {
if let Some((atype, acode)) = attacker.split_once("/") { if let Some((atype, acode)) = attacker.split_once("/") {
if let Some(aitem) = if let Some(aitem) = ctx.trans.find_item_by_type_code(atype, acode).await? {
ctx.trans.find_item_by_type_code(atype, acode).await? if let Some((_, session_dat)) = session.as_ref() {
{
attacker_names.push(aitem.display_for_session(session_dat)); attacker_names.push(aitem.display_for_session(session_dat));
}
// We don't push the actual attacker Item, because another attacker // We don't push the actual attacker Item, because another attacker
// might re-target this attacker when we escape, causing the structure // might re-target this attacker when we escape, causing the structure
// to be out of date. Instead, we push the type, code pair and look it // to be out of date. Instead, we push the type, code pair and look it
@ -544,7 +543,6 @@ async fn attempt_move_immediate(
} }
} }
} }
}
let attacker_names_ref = attacker_names let attacker_names_ref = attacker_names
.iter() .iter()
.map(|n| n.as_str()) .map(|n| n.as_str())