Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed #7962

Browse Source
This commit is contained in:
Anuken
2023-01-07 14:01:28 -05:00
parent 0b00747f29
commit 2a71f4620e
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/mod/Mods.java
View File

@@ -813,7 +813,7 @@ public class Mods implements Loadable{
}catch(Throwable ignored){ }catch(Throwable ignored){
} }
if(meta == null) continue; if(meta == null || meta.name == null) continue;
dependencies.put(meta.name, meta.dependencies); dependencies.put(meta.name, meta.dependencies);
fileMapping.put(meta.name, file); fileMapping.put(meta.name, file);
} }

13
ios/src/mindustry/ios/IOSLauncher.java
View File

@@ -218,8 +218,8 @@ public class IOSLauncher extends IOSApplication.Delegate{
if(file.extension().equalsIgnoreCase(saveExtension)){ //open save 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)))); SaveMeta meta = SaveIO.getMeta(new DataInputStream(new InflaterInputStream(file.read(Streams.defaultBufferSize))));
if(meta.tags.containsKey("name")){ if(meta.tags.containsKey("name")){
//is map //is map
@@ -232,13 +232,12 @@ public class IOSLauncher extends IOSApplication.Delegate{
SaveSlot slot = control.saves.importSave(file); SaveSlot slot = control.saves.importSave(file);
ui.load.runLoadSave(slot); ui.load.runLoadSave(slot);
} }
}catch(IOException e){ }else{
ui.showException("@save.import.fail", e); ui.showErrorMessage("@save.import.invalid");
} }
}else{ }catch(Throwable e){
ui.showErrorMessage("@save.import.invalid"); ui.showException("@save.import.fail", e);
} }
} }
})); }));
} }