mirrors/stevenarella
mirrors
/
stevenarella
mirror of https://github.com/iceiix/stevenarella.git
1
0
Fork 0
Code Issues 1 Projects Releases Wiki Activity

Fix a crash caused by trying to load a skin whilst missing vanilla resources

This commit is contained in:
Thinkofname 2016-04-25 13:31:24 +01:00
parent 4436736dce
commit 61829c055a
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/render/mod.rs
View File

@ -986,10 +986,13 @@ impl TextureManager {
let res = self.resources.clone();
// TODO: This shouldn't be hardcoded to steve but instead
// have a way to select alex as a default.
let mut val = res.read().unwrap().open("minecraft", "textures/entity/steve.png").unwrap();
let mut data = Vec::new();
val.read_to_end(&mut data).unwrap();
let img = image::load_from_memory(&data).unwrap();
let img = if let Some(mut val) = res.read().unwrap().open("minecraft", "textures/entity/steve.png") {
let mut data = Vec::new();
val.read_to_end(&mut data).unwrap();
image::load_from_memory(&data).unwrap()
} else {
image::DynamicImage::new_rgba8(64, 64)
};
self.put_dynamic(&format!("skin-{}", hash), img);
self.skins.insert(hash.to_owned(), AtomicIsize::new(0));
renderer.skin_request.send(hash.to_owned()).unwrap();