diff --git a/TrueCraft.Client/Rendering/TextureMapper.cs b/TrueCraft.Client/Rendering/TextureMapper.cs index 1ad0bf9..4f2e162 100644 --- a/TrueCraft.Client/Rendering/TextureMapper.cs +++ b/TrueCraft.Client/Rendering/TextureMapper.cs @@ -84,21 +84,21 @@ namespace TrueCraft.Client.Rendering public void AddTexturePack(TexturePack texturePack) { if (texturePack == null) - throw new ArgumentException(); + return; - var archive = new ZipFile(Path.Combine(TexturePack.TexturePackPath, texturePack.Name)); - foreach (var entry in archive.Entries) + // Make sure to 'silence' errors loading custom texture packs; + // they're unimportant as we can just use default textures. + try { - // Make sure to 'silence' errors loading custom texture packs; - // they're unimportant as we can just use default textures. - try + var archive = new ZipFile(Path.Combine(TexturePack.TexturePackPath, texturePack.Name)); + foreach (var entry in archive.Entries) { var key = entry.FileName; using (var stream = entry.OpenReader()) AddTexture(key, Texture2D.FromStream(Device, stream)); } - catch { } } + catch { return; } } /// diff --git a/TrueCraft.Core/TexturePack.cs b/TrueCraft.Core/TexturePack.cs index d28e086..75d1bab 100644 --- a/TrueCraft.Core/TexturePack.cs +++ b/TrueCraft.Core/TexturePack.cs @@ -43,7 +43,7 @@ namespace TrueCraft.Core /// public static TexturePack FromArchive(string path) { - if (string.IsNullOrEmpty(path) || !File.Exists(path)) + if (string.IsNullOrEmpty(path)) throw new ArgumentException(); string description = Unknown.Description;