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

Bugfixes

Browse Source
This commit is contained in:
Anuken
2019-09-28 10:34:50 -04:00
parent 4e55cbbfe8
commit a74722aea5
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/io/anuke/mindustry/core/NetServer.java
View File

@@ -262,7 +262,7 @@ public class NetServer implements ApplicationListener{
} }
boolean checkPass(){ 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))); 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; 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)); playerGroup.all().each(p -> p.uuid != null && p.uuid.equals(target.uuid), p -> p.con.kick(KickReason.vote));

4
core/src/io/anuke/mindustry/entities/type/FlyingUnit.java
View File

@@ -36,6 +36,10 @@ public abstract class FlyingUnit extends BaseUnit{
if(target == null) targetClosestEnemyFlag(BlockFlag.producer); if(target == null) targetClosestEnemyFlag(BlockFlag.producer);
if(target == null) targetClosestEnemyFlag(BlockFlag.turret); if(target == null) targetClosestEnemyFlag(BlockFlag.turret);
if(target == null && isCommanded() && getCommand() != UnitCommand.attack){
onCommand(getCommand());
}
} }
if(getClosestSpawner() == null && getSpawner() != null && target == null){ if(getClosestSpawner() == null && getSpawner() != null && target == null){

5
ios/src/io/anuke/mindustry/IOSLauncher.java
View File

@@ -13,7 +13,6 @@ import io.anuke.mindustry.io.*;
import io.anuke.mindustry.ui.*; import io.anuke.mindustry.ui.*;
import org.robovm.apple.foundation.*; import org.robovm.apple.foundation.*;
import org.robovm.apple.uikit.*; import org.robovm.apple.uikit.*;
import org.robovm.apple.uikit.UIBarButtonItem.*;
import org.robovm.objc.block.*; import org.robovm.objc.block.*;
import java.io.*; import java.io.*;
@@ -59,7 +58,9 @@ public class IOSLauncher extends IOSApplication.Delegate{
if(documentURLs.size() < 1) return; if(documentURLs.size() < 1) return;
cont.dismissViewController(true, () -> {}); 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 @Override