Lanmikeman/Launcher
1
1
Fork 0
mirror of https://github.com/GravitLauncher/Launcher synced 2024-12-23 00:51:01 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'hotfix/4.3.3b2'

Browse source
This commit is contained in:
Gravit 2019-02-17 18:49:01 +07:00
commit d18f0ee80a
No known key found for this signature in database
GPG key ID: 061981E1E85D3216
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
LaunchServer/src/main/java/ru/gravit/launchserver/response/admin/ExecCommandResponse.java
View file

@ -22,15 +22,15 @@ public void reply() throws Exception {
requestError("Access denied");
writeNoError(output);
String cmd = input.readString(SerializeLimits.MAX_COMMAND);
LogHelper.Output loutput = message -> {
LogHelper.OutputEnity loutput = new LogHelper.OutputEnity(message -> {
try {
output.writeBoolean(true);
output.writeString(message, SerializeLimits.MAX_COMMAND);
} catch (IOException e) {
LogHelper.error(e);
}
};
LogHelper.addOutput(loutput, LogHelper.OutputTypes.PLAIN);
}, LogHelper.OutputTypes.PLAIN);
LogHelper.addOutput(loutput);
try {
server.commandHandler.eval(cmd, false);
output.writeBoolean(false);

2
LaunchServer/src/main/java/ru/gravit/launchserver/socket/Client.java
View file

@ -14,7 +14,7 @@ public class Client {
public boolean checkSign;
public ClientPermissions permissions;
public String username;
public LogHelper.Output logOutput;
public LogHelper.OutputEnity logOutput;
public Client(long session) {
this.session = session;

4
LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/admin/AddLogListenerResponse.java
View file

@ -43,8 +43,8 @@ public void execute(WebSocketService service, ChannelHandlerContext ctx, Client
LogHelper.info("Client %s remove log listener", client.username);
}
};
client.logOutput = output;
LogHelper.addOutput(output, outputType);
client.logOutput = new LogHelper.OutputEnity(output,outputType);
LogHelper.addOutput(client.logOutput);
}
}
}

2
libLauncher/src/main/java/ru/gravit/launcher/Launcher.java
View file

@ -61,7 +61,7 @@ public final class Launcher {
public static final int MAJOR = 4;
public static final int MINOR = 3;
public static final int PATCH = 3;
public static final int BUILD = 1;
public static final int BUILD = 2;
public static final Version.Type RELEASE = Version.Type.STABLE;
public static GsonBuilder gsonBuilder;
public static Gson gson;