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

Merge branch 'sam/safe-make-npc' into 'master'

Browse Source 
Make npc command no longer crashes server

See merge request veloren/veloren!3085
This commit is contained in:
Samuel Keiffer 2022-01-05 00:43:40 +00:00
commit 7364c5a31e
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/src/cmd.rs
View File

@ -33,7 +33,7 @@ use common::{
depot,
effect::Effect,
event::{EventBus, ServerEvent},
generation::EntityInfo,
generation::{EntityConfig, EntityInfo},
npc::{self, get_npc_name},
resources::{BattleMode, PlayerPhysicsSettings, Time, TimeOfDay},
terrain::{Block, BlockKind, SpriteKind, TerrainChunkSize},
@ -588,10 +588,16 @@ fn handle_make_npc(
None => 1,
};
let config = match EntityConfig::load(&entity_config) {
Ok(asset) => asset.read(),
Err(_err) => return Err(format!("Failed to load entity config: {}", entity_config)),
};
let rng = &mut rand::thread_rng();
for _ in 0..number {
let comp::Pos(pos) = position(server, target, "target")?;
let entity_info = EntityInfo::at(pos).with_asset_expect(&entity_config);
let entity_info =
EntityInfo::at(pos).with_entity_config(config.clone(), Some(&entity_config));
match NpcData::from_entity_info(entity_info, rng) {
NpcData::Waypoint(_) => {
return Err("Waypoint spawning is not implemented".to_owned());