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

removelights no longer deletes players with lanterns

Browse Source
This commit is contained in:
KyoZM 2019-10-07 01:03:53 -03:00
parent ea82115656
commit 064f33666a
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
server/src/cmd.rs
View File

@ -969,22 +969,14 @@ fn handle_remove_lights(server: &mut Server, entity: EcsEntity, args: String, ac
match opt_player_pos {
Some(player_pos) => {
let ecs = server.state.ecs();
let entities = &ecs.entities();
let light_emitters = &ecs.read_storage::<comp::LightEmitter>();
let lights = (entities, light_emitters).join();
for (entity, _) in lights {
let pos = ecs
.read_storage::<comp::Pos>()
.get(entity)
.copied();
if let Some(pos) = pos {
if opt_radius.is_some() {
if pos.0.distance(player_pos.0) < opt_radius.unwrap() {
to_delete.push(entity);
}
} else {
to_delete.push(entity);
}
for (entity, pos, _, _) in (
&ecs.entities(),
&ecs.read_storage::<comp::Pos>(),
&ecs.read_storage::<comp::LightEmitter>(),
!&ecs.read_storage::<comp::Player>()
).join() {
if opt_radius.map(|r| pos.0.distance(player_pos.0) < r).unwrap_or(true) {
to_delete.push(entity);
}
}
},