diff --git a/core/src/mindustry/mod/Mods.java b/core/src/mindustry/mod/Mods.java index ab53f1b068..a0fbdf5249 100644 --- a/core/src/mindustry/mod/Mods.java +++ b/core/src/mindustry/mod/Mods.java @@ -813,7 +813,7 @@ public class Mods implements Loadable{ }catch(Throwable ignored){ } - if(meta == null) continue; + if(meta == null || meta.name == null) continue; dependencies.put(meta.name, meta.dependencies); fileMapping.put(meta.name, file); } diff --git a/ios/src/mindustry/ios/IOSLauncher.java b/ios/src/mindustry/ios/IOSLauncher.java index 7faab63ec0..f6a2834b9f 100644 --- a/ios/src/mindustry/ios/IOSLauncher.java +++ b/ios/src/mindustry/ios/IOSLauncher.java @@ -218,8 +218,8 @@ public class IOSLauncher extends IOSApplication.Delegate{ if(file.extension().equalsIgnoreCase(saveExtension)){ //open save - if(SaveIO.isSaveValid(file)){ - try{ + try{ + if(SaveIO.isSaveValid(file)){ SaveMeta meta = SaveIO.getMeta(new DataInputStream(new InflaterInputStream(file.read(Streams.defaultBufferSize)))); if(meta.tags.containsKey("name")){ //is map @@ -232,13 +232,12 @@ public class IOSLauncher extends IOSApplication.Delegate{ SaveSlot slot = control.saves.importSave(file); ui.load.runLoadSave(slot); } - }catch(IOException e){ - ui.showException("@save.import.fail", e); + }else{ + ui.showErrorMessage("@save.import.invalid"); } - }else{ - ui.showErrorMessage("@save.import.invalid"); + }catch(Throwable e){ + ui.showException("@save.import.fail", e); } - } })); }