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

Cleanup

Browse Source
This commit is contained in:
Anuken
2019-11-07 17:16:09 -05:00
parent d1196f8e85
commit d05f56c5b1
3 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/io/anuke/mindustry/net/Host.java
+1
View File
@@ -11,6 +11,7 @@ public class Host{
public final int version; public final int version;
public final String versionType; public final String versionType;
public final Gamemode mode; public final Gamemode mode;
public int ping;
public Host(String name, String address, String mapname, int wave, int players, int version, String versionType, Gamemode mode, int playerLimit){ public Host(String name, String address, String mapname, int wave, int players, int version, String versionType, Gamemode mode, int playerLimit){
this.name = name; this.name = name;
core/src/io/anuke/mindustry/world/blocks/distribution/LiquidJunction.java
-1
View File
@@ -10,7 +10,6 @@ public class LiquidJunction extends LiquidBlock{
public LiquidJunction(String name){ public LiquidJunction(String name){
super(name); super(name);
hasLiquids = true;
} }
@Override @Override
ios/src/io/anuke/mindustry/IOSLauncher.java
+12 -1
View File
@@ -58,7 +58,18 @@ public class IOSLauncher extends IOSApplication.Delegate{
if(documentURLs.size() < 1) return; if(documentURLs.size() < 1) return;
cont.dismissViewController(true, () -> {}); cont.dismissViewController(true, () -> {});
controller.importDocument(documentURLs.get(0), new NSURL(getDocumentsDirectory() + "/document"), UIDocumentBrowserImportMode.Copy, (url, error) -> cons.get(Core.files.absolute(url.getPath())));
try{
controller.importDocument(documentURLs.get(0), new NSURL(getDocumentsDirectory() + "/document"), UIDocumentBrowserImportMode.Copy, (url, error) -> {
try{
cons.get(Core.files.absolute(url.getPath()));
}catch(Throwable t){
ui.showException(t);
}
});
}catch(Throwable t){
ui.showException(t);
}
} }
@Override @Override