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

report plugin errors to the user

Browse Source
This commit is contained in:
Christof Petig
2024-03-14 00:21:18 +01:00
parent 8dd4729965
commit 166653b355
3 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/state/src/plugin/mod.rs
View File

@ -243,7 +243,7 @@ impl PluginMgr {
base_dir: &Path, base_dir: &Path,
data: Vec<u8>, data: Vec<u8>,
) -> Result<PluginHash, PluginError> { ) -> Result<PluginHash, PluginError> {
let path = store_server_plugin(base_dir, data)?; let path = store_server_plugin(base_dir, data).map_err(PluginError::Io)?;
self.load_server_plugin(path) self.load_server_plugin(path)
} }

13
voxygen/src/menu/char_selection/mod.rs
View File

@ -282,16 +282,19 @@ impl PlayState for CharSelectionState {
tracing::info!("plugin data {}", data.len()); tracing::info!("plugin data {}", data.len());
let mut client = self.client.borrow_mut(); let mut client = self.client.borrow_mut();
#[cfg(feature = "plugins")] #[cfg(feature = "plugins")]
if let Ok(hash) = client match client
.state() .state()
.ecs() .ecs()
.write_resource::<PluginMgr>() .write_resource::<PluginMgr>()
.cache_server_plugin(&global_state.config_dir, data) .cache_server_plugin(&global_state.config_dir, data)
{ {
if client.plugin_received(hash) == 0 { Ok(hash) => {
// now load characters (plugins might contain items) if client.plugin_received(hash) == 0 {
client.load_character_list(); // now load characters (plugins might contain items)
} client.load_character_list();
}
},
Err(e) => tracing::error!(?e, "cache_server_plugin"),
} }
}, },
// TODO: See if we should handle StartSpectate here instead. // TODO: See if we should handle StartSpectate here instead.

13
voxygen/src/menu/main/mod.rs
View File

@ -284,16 +284,19 @@ impl PlayState for MainMenuState {
tracing::info!("plugin data {}", data.len()); tracing::info!("plugin data {}", data.len());
if let InitState::Pipeline(client) = &mut self.init { if let InitState::Pipeline(client) = &mut self.init {
#[cfg(feature = "plugins")] #[cfg(feature = "plugins")]
if let Ok(hash) = client match client
.state() .state()
.ecs() .ecs()
.write_resource::<PluginMgr>() .write_resource::<PluginMgr>()
.cache_server_plugin(&global_state.config_dir, data) .cache_server_plugin(&global_state.config_dir, data)
{ {
if client.plugin_received(hash) == 0 { Ok(hash) => {
// now load characters (plugins might contain items) if client.plugin_received(hash) == 0 {
client.load_character_list(); // now load characters (plugins might contain items)
} client.load_character_list();
}
},
Err(e) => tracing::error!(?e, "cache_server_plugin"),
} }
} }
}, },