diff options
Diffstat (limited to 'src/systems')
| -rw-r--r-- | src/systems/interact.rs | 14 | ||||
| -rw-r--r-- | src/systems/migrate.rs | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/systems/interact.rs b/src/systems/interact.rs index 0629dc1..81563e8 100644 --- a/src/systems/interact.rs +++ b/src/systems/interact.rs @@ -85,7 +85,7 @@ impl <'a> System<'a> for Interact { if let (Some(player), Some(whitelist)) = (players.get(actor), whitelists.get_mut(ent)){ if let Some(playername) = strip_prefix(&argument, "visit ") { let destination = dest.format(hashmap!("{player}" => playername)); - if let Some(set) = whitelist.allowed.get(&destination.name) { + if let Some(set) = whitelist.allowed.get(&destination.0) { if set.contains(&player.id){ emigration.emigrants.push((player.id.clone(), destination, RoomPos::Unknown)); } else { @@ -95,16 +95,16 @@ impl <'a> System<'a> for Interact { say(ear, format!("unknown destination {}", playername), name); } } else if let Some(playername) = strip_prefix(&argument, "allow ") { - let destination = dest.format(hashmap!("{player}" => player.id.name.as_str())); - whitelist.allowed.entry(destination.name).or_insert_with(HashSet::new).insert(PlayerId{name: playername.to_string()}); + let destination = dest.format(hashmap!("{player}" => player.id.0.as_str())); + whitelist.allowed.entry(destination.0).or_insert_with(HashSet::new).insert(PlayerId( playername.to_string())); say(ear, format!("allowed {} to enter your home", playername), name); } else if let Some(playername) = strip_prefix(&argument, "disallow ") { - let destination = dest.format(hashmap!("{player}" => player.id.name.as_str())); - whitelist.allowed.entry(destination.name).or_insert_with(HashSet::new).remove(&PlayerId{name: playername.to_string()}); + let destination = dest.format(hashmap!("{player}" => player.id.0.as_str())); + whitelist.allowed.entry(destination.0).or_insert_with(HashSet::new).remove(&PlayerId( playername.to_string())); say(ear, format!("disallowed {} to enter your home", playername), name); } else if argument.starts_with("whitelist") { - let destination = dest.format(hashmap!("{player}" => player.id.name.as_str())); - let allowed = whitelist.allowed.entry(destination.name).or_insert_with(HashSet::new).iter().map(|id| id.name.as_str()).collect::<Vec<&str>>(); + let destination = dest.format(hashmap!("{player}" => player.id.0.as_str())); + let allowed = whitelist.allowed.entry(destination.0).or_insert_with(HashSet::new).iter().map(|id| id.0.as_str()).collect::<Vec<&str>>(); say(ear, format!("allowed players: {}", allowed.join(", ")), name); } } diff --git a/src/systems/migrate.rs b/src/systems/migrate.rs index f9019d8..2007734 100644 --- a/src/systems/migrate.rs +++ b/src/systems/migrate.rs @@ -28,7 +28,7 @@ impl <'a> System<'a> for Migrate { for (player, position, _moved) in (&players, &positions, &moved).join() { for ent in ground.cells.get(&position.pos).unwrap() { if let Some(exit) = exits.get(*ent) { - let destination = exit.destination.format(hashmap!("{player}" => player.id.name.as_str())); + let destination = exit.destination.format(hashmap!("{player}" => player.id.0.as_str())); emigration.emigrants.push((player.id.clone(), destination, exit.dest_pos.clone())); break; } |