Bugfixes

hudawei996 · Sep 28, 2019 · a74722a · a74722a
1 parent 4e55cbb
commit a74722a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/core/src/io/anuke/mindustry/core/NetServer.java b/core/src/io/anuke/mindustry/core/NetServer.java
@@ -262,7 +262,7 @@ void vote(Player player, int d){
             }
 
             boolean checkPass(){
-                if(votes >= votesRequired() && target.isAdded() && target.con.isConnected()){
+                if(votes >= votesRequired()){
                     Call.sendMessage(Strings.format("[orange]Vote passed.[scarlet] {0}[orange] will be banned from the server for {1} minutes.", target.name, (kickDuration/60)));
                     target.getInfo().lastKicked = Time.millis() + kickDuration*1000;
                     playerGroup.all().each(p -> p.uuid != null && p.uuid.equals(target.uuid), p -> p.con.kick(KickReason.vote));

diff --git a/core/src/io/anuke/mindustry/entities/type/FlyingUnit.java b/core/src/io/anuke/mindustry/entities/type/FlyingUnit.java
@@ -36,6 +36,10 @@ public void update(){
 
                 if(target == null) targetClosestEnemyFlag(BlockFlag.producer);
                 if(target == null) targetClosestEnemyFlag(BlockFlag.turret);
+
+                if(target == null && isCommanded() && getCommand() != UnitCommand.attack){
+                    onCommand(getCommand());
+                }
             }
 
             if(getClosestSpawner() == null && getSpawner() != null && target == null){

diff --git a/ios/src/io/anuke/mindustry/IOSLauncher.java b/ios/src/io/anuke/mindustry/IOSLauncher.java
@@ -13,7 +13,6 @@
 import io.anuke.mindustry.ui.*;
 import org.robovm.apple.foundation.*;
 import org.robovm.apple.uikit.*;
-import org.robovm.apple.uikit.UIBarButtonItem.*;
 import org.robovm.objc.block.*;
 
 import java.io.*;
@@ -59,7 +58,9 @@ public void didPickDocumentsAtURLs(UIDocumentBrowserViewController controller, N
                         if(documentURLs.size() < 1) return;
 
                         cont.dismissViewController(true, () -> {});
-                        cons.accept(Core.files.absolute(documentURLs.get(0).getPath()));
+                        controller.importDocument(documentURLs.get(0), new NSURL(getDocumentsDirectory() + "/document"), UIDocumentBrowserImportMode.Copy, (url, error) -> {
+                            cons.accept(Core.files.absolute(url.getPath()));
+                        });
                     }
 
                     @Override