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

Fixed server run error

Browse Source
This commit is contained in:
Anuken
2018-10-28 18:04:07 -04:00
parent 557b86a7a9
commit 968be8eb8f
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -27,7 +27,7 @@ allprojects {
appName = 'Mindustry' appName = 'Mindustry'
gdxVersion = '1.9.8' gdxVersion = '1.9.8'
roboVMVersion = '2.3.0' roboVMVersion = '2.3.0'
uCoreVersion = '6080b6fb8c81f9c8e8dcb5809c2399061e15a63f' uCoreVersion = '95b407764765c2f1bc9775d22372edc84af2d186'
getVersionString = { getVersionString = {
String buildVersion = getBuildVersion() String buildVersion = getBuildVersion()

4
server/src/io/anuke/mindustry/server/ServerControl.java
View File

@@ -28,7 +28,6 @@ import io.anuke.ucore.util.CommandHandler;
import io.anuke.ucore.util.CommandHandler.Command; import io.anuke.ucore.util.CommandHandler.Command;
import io.anuke.ucore.util.CommandHandler.Response; import io.anuke.ucore.util.CommandHandler.Response;
import io.anuke.ucore.util.CommandHandler.ResponseType; import io.anuke.ucore.util.CommandHandler.ResponseType;
import io.anuke.ucore.util.Log;
import io.anuke.ucore.util.Strings; import io.anuke.ucore.util.Strings;
import java.io.IOException; import java.io.IOException;
@@ -378,7 +377,7 @@ public class ServerControl extends Module{
} }
}); });
handler.register("ban", "<type (id/name/ip)> <username/IP/ID...>", "Ban a person.", arg -> { handler.register("ban", "<type-id/name/ip> <username/IP/ID...>", "Ban a person.", arg -> {
if(arg[0].equals("id")){ if(arg[0].equals("id")){
netServer.admins.banPlayerID(arg[1]); netServer.admins.banPlayerID(arg[1]);
info("Banned."); info("Banned.");
@@ -602,6 +601,7 @@ public class ServerControl extends Module{
private void readCommands(){ private void readCommands(){
Scanner scan = new Scanner(System.in); Scanner scan = new Scanner(System.in);
while(scan.hasNext()){ while(scan.hasNext()){
System.out.print("> ");
String line = scan.nextLine(); String line = scan.nextLine();
Gdx.app.postRunnable(() -> { Gdx.app.postRunnable(() -> {