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

Make /kill_npcs delete entities instead of setting health to 0, to avoid drops or other undesired effects from occuring.

Browse Source
This commit is contained in:
Imbris 2022-08-20 17:12:14 -04:00
parent ca66a9f79b
commit 0ee0d446f1
1 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
server/src/cmd.rs
View File

@ -1826,27 +1826,35 @@ fn handle_kill_npcs(
false
};
let ecs = server.state.ecs();
let mut healths = ecs.write_storage::<comp::Health>();
let players = ecs.read_storage::<comp::Player>();
let alignments = ecs.read_storage::<Alignment>();
let mut count = 0;
let to_kill = {
let ecs = server.state.ecs();
let entities = ecs.entities();
let healths = ecs.write_storage::<comp::Health>();
let players = ecs.read_storage::<comp::Player>();
let alignments = ecs.read_storage::<Alignment>();
for (mut health, (), alignment) in (&mut healths, !&players, alignments.maybe()).join() {
let should_kill = kill_pets
|| if let Some(Alignment::Owned(owned)) = alignment {
ecs.entity_from_uid(owned.0)
.map_or(true, |owner| !players.contains(owner))
} else {
true
};
(&entities, &healths, !&players, alignments.maybe())
.join()
.filter_map(|(entity, _health, (), alignment)| {
let should_kill = kill_pets
|| if let Some(Alignment::Owned(owned)) = alignment {
ecs.entity_from_uid(owned.0)
.map_or(true, |owner| !players.contains(owner))
} else {
true
};
if should_kill {
count += 1;
health.kill();
should_kill.then(|| entity)
})
.collect::<Vec<_>>()
};
let count = to_kill.len();
for entity in to_kill {
// Directly remove entities instead of modifying health to avoid loot drops.
if let Err(e) server.state.delete_entity_recorded(entity) {
error!(?e, ?entity, "Failed to delete entity");
}
}
let text = if count > 0 {
format!("Destroyed {} NPCs.", count)
} else {