Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

rustfmt updates

Browse Source
This commit is contained in:
tommy 2019-07-12 17:43:20 -04:00
parent 42861541cf
commit 3c9046c5d0
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/src/cmd.rs
View File

@ -416,15 +416,15 @@ fn kind_to_body(kind: NpcKind) -> comp::Body {
fn handle_killnpcs(server: &mut Server, entity: EcsEntity, _args: String, _action: &ChatCommand) {
let ecs = server.state.ecs();
let mut npclist=Vec::new();
let mut npclist = Vec::new();
{
// get the npc list, scope read access to prevent
// 'Already borrowed: InvalidBorrow' error when setting health stat
let entities = ecs.entities();
let stats = ecs.read_storage::<comp::Stats>();
let players = ecs.read_storage::<comp::Player>();
for (npc,stat,()) in (&entities,&stats,!&players).join() {
npclist.push((npc,stat.name.clone()));
for (npc, stat, ()) in (&entities, &stats, !&players).join() {
npclist.push((npc, stat.name.clone()));
}
}
for npc in npclist {
@ -432,7 +432,7 @@ fn handle_killnpcs(server: &mut Server, entity: EcsEntity, _args: String, _actio
text += " is no more.";
server.clients.notify(entity, ServerMsg::Chat(text));
ecs.write_storage::<comp::Stats>()
.get_mut(npc.0)
.map(|s| s.health.set_to(0, comp::HealthSource::Command));
.get_mut(npc.0)
.map(|s| s.health.set_to(0, comp::HealthSource::Command));
}
}