From d05f56c5b1413f4b2a5b6624634cad564269c6d5 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 7 Nov 2019 17:16:09 -0500
Subject: [PATCH] Cleanup

---
 core/src/io/anuke/mindustry/net/Host.java           |  1 +
 .../world/blocks/distribution/LiquidJunction.java   |  1 -
 ios/src/io/anuke/mindustry/IOSLauncher.java         | 13 ++++++++++++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/core/src/io/anuke/mindustry/net/Host.java b/core/src/io/anuke/mindustry/net/Host.java
index 44b6c6a665..498e40802e 100644
--- a/core/src/io/anuke/mindustry/net/Host.java
+++ b/core/src/io/anuke/mindustry/net/Host.java
@@ -11,6 +11,7 @@ public class Host{
     public final int version;
     public final String versionType;
     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){
         this.name = name;
diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/LiquidJunction.java b/core/src/io/anuke/mindustry/world/blocks/distribution/LiquidJunction.java
index d7db89f637..db5623276f 100644
--- a/core/src/io/anuke/mindustry/world/blocks/distribution/LiquidJunction.java
+++ b/core/src/io/anuke/mindustry/world/blocks/distribution/LiquidJunction.java
@@ -10,7 +10,6 @@ public class LiquidJunction extends LiquidBlock{
 
     public LiquidJunction(String name){
         super(name);
-        hasLiquids = true;
     }
 
     @Override
diff --git a/ios/src/io/anuke/mindustry/IOSLauncher.java b/ios/src/io/anuke/mindustry/IOSLauncher.java
index 7bc46ef935..7a09f9e358 100644
--- a/ios/src/io/anuke/mindustry/IOSLauncher.java
+++ b/ios/src/io/anuke/mindustry/IOSLauncher.java
@@ -58,7 +58,18 @@ public class IOSLauncher extends IOSApplication.Delegate{
                         if(documentURLs.size() < 1) return;
 
                         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